Merge branch 'master' into fsl_warputils

* master: (21 commits)
  Fixed error in _rotate_bvec that was adding an extra entry to the output rotated_bvecs file and offsetting the correction by one volume.
  add Bandpass to init
  homogenize name function accross interfaces
  fixing for new gen_filename autopep8
  autopep8
  few interfaces added, pep8
  add min version for bbr options
  pep8
  doctest
  Modified create_dmri_preprocessing to allow for pipeline use with and without fieldmap files  - Added use_fieldmap flag to create_dmri_preprocessing
  fixes
  inverse deformation field
  typo
  adding fsl6 options (bbr)
  fixing ApplyInverseDeformationOutputSpec bug
  Revert "simplify in_file"
  simplify in_file
  merge
  mock changes
  trailing comma fix
  ...

Author: bpinsard

nipype/interfaces/afni/__init__.py

@@ -11,4 +11,5 @@
 from .preprocess import (To3D, Refit, Resample, TStat, Automask, Volreg, Merge,
                          ZCutUp, Calc, TShift, Warp, Detrend, Despike, Copy,
                          Fourier, Allineate, Maskave, SkullStrip, TCat, Fim,
-                         TCorrelate, BrickStat, ROIStats, AutoTcorrelate)
+                         TCorrelate, BrickStat, ROIStats, AutoTcorrelate,
+                         BlurInMask, Autobox, TCorrMap, Bandpass)

nipype/interfaces/afni/base.py

@@ -135,7 +135,7 @@ def _output_update(self):
         self._outputtype = self.inputs.outputtype
 
     @classmethod
-    def set_default_outputtype(cls, outputtype):
+    def set_default_output_type(cls, outputtype):
         """Set the default output type for AFNI classes.
 
         This method is used to set the default output type for all afni