Merge remote-tracking branch 'upstream/master' into rel/0.13-initiate

* upstream/master:
  Update requirements.txt
  Update requirements.txt
  Update conf.py

Author: satra

requirements.txt

@@ -1 +1,13 @@
-Nipype no longer maintains this file. Use ``pip install \-e .`` instead.
+numpy>=1.6.2
+scipy>=0.11
+networkx>=1.7
+traits>=4.3
+python-dateutil>=1.5
+nibabel>=2.0.1
+nose>=1.2
+future==0.15.2
+simplejson>=3.8.0
+prov>=1.4.0
+xvfbwrapper
+psutil
+funcsigs