Merge branch 'master' of github.com:EleutherAI/lm_evaluation_harness into cfsquad

# Conflicts:
#	lm_eval/tasks/squad.py

tests/test_tasks.py

 import lm_eval.tasks as tasks
 import lm_eval.base as base
-from itertools import islice
 import pytest
+from itertools import islice
 
 
 @pytest.mark.parametrize("taskname,Task", tasks.TASK_REGISTRY.items())