Merge branch 'master' into bug/fnirtfileutils

Author: oesteban

CHANGES

@@ -1,6 +1,8 @@
 Next Release
 ============
 
+* ENH: New FSL interfaces: WarpPoints, WarpPointsToStd.
+* ENH: New Freesurfer interface: MRIPretess
 * ENH: New miscelaneous interface: AddCSVRow
 * ENH: FUGUE interface has been refactored to use the name_template system, 3 examples 
        added to doctests, some bugs solved.
@@ -24,6 +26,9 @@ Next Release
 * FIX: MRTrix tracking algorithms were ignoring mask parameters.
 * FIX: FNIRT registration pathway and associated OpenFMRI example script
 * FIX: spm12b compatibility for Model estimate
+* FIX: Batch scheduler controls the number of maximum jobs properly
+* FIX: Update for FSL 5.0.7 which deprecated Contrast Manager
+* ENH: Added ANTS based openfmri workflow
 
 Release 0.9.2 (January 31, 2014)
 ============

README.rst

@@ -8,6 +8,25 @@ NIPYPE: Neuroimaging in Python: Pipelines and Interfaces
 .. image:: https://coveralls.io/repos/nipy/nipype/badge.png
   :target: https://coveralls.io/r/nipy/nipype
 
+.. image:: https://pypip.in/version/nipype/badge.png
+    :target: https://pypi.python.org/pypi/nipype/
+    :alt: Latest Version
+
+.. image:: https://pypip.in/download/nipype/badge.png
+    :target: https://pypi.python.org/pypi/nipype/
+    :alt: Downloads
+
+.. image:: https://pypip.in/py_versions/nipype/badge.png
+    :target: https://pypi.python.org/pypi/nipype/
+    :alt: Supported Python versions
+
+.. image:: https://pypip.in/status/nipype/badge.png
+    :target: https://pypi.python.org/pypi/nipype/
+    :alt: Development Status
+
+.. image:: https://pypip.in/license/nipype/badge.png
+    :target: https://pypi.python.org/pypi/nipype/
+    :alt: License
 
 Current neuroimaging software offer users an incredible opportunity to
 analyze data using a variety of different algorithms. However, this has

doc/_templates/indexsidebar.html

@@ -5,8 +5,9 @@ <h3>{{ _('Links') }}</h3>
     <li>Docs: <a href="http://nipy.org/nipype">Stable</a> · <a href="http://www.mit.edu/~satra/nipype-nightly/">Nightly</a></li>
     <li>Code: <a href="http://github.com/nipy/nipype">Github</a> · <a href="http://github.com/nipy/nipype/issues">Bugs-Requests</a></li>
     <li>Forum: <a href="http://groups.google.com/group/nipy-user">User</a> · <a href="http://projects.scipy.org/mailman/listinfo/nipy-devel">Developer</a></li>
-    <li>Info: <a href="http://nipy.org/software/license/index.html">License</a> · <a href="http://nipy.org/about/funding.html">Funding</a></li>
+    <li><a href="http://nipy.org/software/license/index.html"><img src="https://pypip.in/license/nipype/badge.png" alt="License"></a> · <a href="http://nipy.org/about/funding.html">Funding</a></li>
     <li><a href="https://travis-ci.org/nipy/nipype"><img src="https://travis-ci.org/nipy/nipype.png?branch=master" alt="travis"></a> · <a href='https://coveralls.io/r/nipy/nipype'><img src='https://coveralls.io/repos/nipy/nipype/badge.png' alt='Coverage Status' /></a></li>
+    <li><a href="https://pypi.python.org/pypi/nipype/"><img src="https://pypip.in/download/nipype/badge.png" alt="Downloads"></a> · <a href='https://pypi.python.org/pypi/nipype/'><img src='https://pypip.in/py_versions/nipype/badge.png' alt='Python Versions' /></a></li>
 </ul>
 
 {% endblock %}

doc/conf.py

@@ -38,7 +38,9 @@
               'sphinx.ext.autosummary',
               'numpy_ext.numpydoc',
               'matplotlib.sphinxext.plot_directive',
-              'matplotlib.sphinxext.only_directives'
+              'matplotlib.sphinxext.only_directives',
+              'matplotlib.sphinxext.ipython_directive',
+              'ipython_console_highlighting'
               ]
 
 # Add any paths that contain templates here, relative to this directory.