Merge branch 'master' into enh/robustfov

Author: chrisgorgo

.travis.yml

@@ -26,9 +26,9 @@ install:
   - source activate testenv
   - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install ordereddict; fi
   - conda install --yes numpy scipy nose traits networkx dateutil
-  - pip install nibabel --use-mirrors
-  - pip install python-coveralls --use-mirrors
-  - pip install nose-cov --use-mirrors
+  - pip install nibabel
+  - pip install python-coveralls
+  - pip install nose-cov
   - pip install https://github.com/RDFLib/rdflib/archive/master.zip
   - pip install https://github.com/trungdong/prov/archive/rdf.zip
   - python setup.py install