Merge branch 'master' into enh/MRTrix3

Conflicts:
	CHANGES
	nipype/interfaces/fsl/__init__.py
	nipype/utils/nipype2boutiques.py

Author: oesteban

CHANGES

@@ -2,6 +2,7 @@ Next release
 ============
 
 * ENH: New interfaces for MRTrix3 (https://github.com/nipy/nipype/pull/1126)
+* ENH: New interface for FSL fslcpgeom utility (https://github.com/nipy/nipype/pull/1152)
 * FIX: Enable absolute path definitions in DCMStack (https://github.com/nipy/nipype/pull/1089,
        replaced by https://github.com/nipy/nipype/pull/1093)
 * ENH: New mesh.MeshWarpMaths to operate on surface-defined warpings
@@ -13,6 +14,7 @@ Next release
 * FIX: FUGUE is now properly listing outputs. (https://github.com/nipy/nipype/pull/978)
 * ENH: Improved FieldMap-Based (FMB) workflow for correction of susceptibility distortions in EPI seqs.
        (https://github.com/nipy/nipype/pull/1019)
+* FIX: In the FSLXcommand _list_outputs function fixed for loop range (https://github.com/nipy/nipype/pull/1071)
 * ENH: Dropped support for now 7 years old Python 2.6 (https://github.com/nipy/nipype/pull/1069)
 * FIX: terminal_output is not mandatory anymore (https://github.com/nipy/nipype/pull/1070)
 * ENH: Added "nipype_cmd" tool for running interfaces from the command line (https://github.com/nipy/nipype/pull/795)

README.rst

@@ -77,10 +77,10 @@ to `NeuroStars.org <http://neurostars.org>`_ with a *nipype* tag. `NeuroStars.or
        http://neurostars.org/t/nipype/
 	   
 
-To participate in the Nipype development related discussion please use the following mailing list::
+To participate in the Nipype development related discussions please use the following mailing list::
        
-       http://projects.scipy.org/mailman/listinfo/nipy-devel
-	   
+       http://mail.python.org/mailman/listinfo/neuroimaging
+
 Please add *[nipype]* to the subject line when posting on the mailing list.
 
 
@@ -124,5 +124,5 @@ There are interfaces to some GNU code but these are entirely optional.
 All trademarks referenced herein are property of their respective
 holders.
 
-Copyright (c) 2009-2014, NIPY Developers
+Copyright (c) 2009-2015, NIPY Developers
 All rights reserved.

examples/fmri_ants_openfmri.py

@@ -175,7 +175,7 @@ def create_reg_workflow(name='registration'):
     """
     Create a mask of the median image coregistered to the anatomical image
     """
-    
+
     mean2anat_mask = Node(fsl.BET(mask=True), name='mean2anat_mask')
     register.connect(mean2anatbbr, 'out_file', mean2anat_mask, 'in_file')
 

matlabscripts/README.txt

@@ -78,6 +78,7 @@ class ComputeMeshWarp(BaseInterface):
 
     input_spec = ComputeMeshWarpInputSpec
     output_spec = ComputeMeshWarpOutputSpec
+    _redirect_x = True
 
     def _triangle_area(self, A, B, C):
         A = np.array(A)
@@ -221,6 +222,7 @@ class MeshWarpMaths(BaseInterface):
 
     input_spec = MeshWarpMathsInputSpec
     output_spec = MeshWarpMathsOutputSpec
+    _redirect_x = True
 
     def _run_interface(self, runtime):
         try: