Merge branch 'pr/686'

Conflicts:
	nipype/interfaces/fsl/utils.py

Author: chrisgorgo

nipype/interfaces/camino/dti.py

@@ -16,6 +16,11 @@ class DTIFitInputSpec(StdOutCommandLineInputSpec):
     in_file = File(exists=True, argstr='%s', mandatory=True, position=1,
         desc='voxel-order data filename')
 
+    bgmask = File(argstr='-bgmask %s', exists=True,
+                  desc=('Provides the name of a file containing a background mask computed using, '
+                        'for example, FSL bet2 program. The mask file contains zero in background '
+                        'voxels and non-zero in foreground.'))
+
     scheme_file = File(exists=True, argstr='%s', mandatory=True, position=2,
         desc='Camino scheme file (b values / vectors, see camino.fsl2scheme)')
 

nipype/interfaces/fsl/utils.py

@@ -1344,7 +1344,6 @@ class InvWarp(FSLCommand):
 
     _cmd = 'invwarp'
 
-
 class ComplexInputSpec(FSLCommandInputSpec):
     complex_in_file = File(exists=True, argstr="%s", position=2)
     complex_in_file2 = File(exists=True, argstr="%s", position=3)