Merge branch 'master' into fix_tutorials

Conflicts:
	examples/fmri_ants_openfmri.py

Author: Mathieu Dubois

CHANGES

@@ -1,6 +1,8 @@
 Next release
 ============
 
+* ENH: New io interfaces for JSON files reading/writing (https://github.com/nipy/nipype/pull/1020)
+* ENH: Enhanced openfmri script to support freesurfer linkage (https://github.com/nipy/nipype/pull/1037)
 * BUG: matplotlib is supposed to be optional (https://github.com/nipy/nipype/pull/1003)
 * FIX: Fix split_filename behaviour when path has no file component (https://github.com/nipy/nipype/pull/1035)
 * ENH: Updated FSL dtifit to include option for grad non-linearities (https://github.com/nipy/nipype/pull/1032)

doc/users/plugins.rst

@@ -140,7 +140,7 @@ particular node might use more resources than other nodes in a workflow.
 LSF
 ---
 
-Submitting via LSF is almost identical to SGE above:
+Submitting via LSF is almost identical to SGE above above except for the optional arguments field:
 
        workflow.run(plugin='LSF')
 
@@ -149,6 +149,18 @@ Optional arguments::
   template: custom template file to use
   bsub_args: any other command line args to be passed to bsub.
 
+SLURM
+-----
+
+Submitting via SLURM is almost identical to SGE above except for the optional arguments field:
+
+       workflow.run(plugin='SLURM')
+
+Optional arguments::
+
+  template: custom template file to use
+  sbatch_args: any other command line args to be passed to bsub.
+
 HTCondor
 --------