added check for dilation==TRUE to ROIv outputs
Merge pull request #560 from swederik/bf/mrtrix_niigz

BF - Added FSL output type NIFTI to dmri mrtrix example
Merge pull request #562 from daniel-ge/fix/lsf

fix: LSF plugin
Merge branch 'master' into spm/reslicetoref

* master:
  Put units into descr.
  FIX: strip extraneous whitespace in trait desc
  Added note about PBS optional argument for maximum jobname length.
  BF: moment parameter was ignored.
  Fixed variable name in PBS plugin.  Now works.
  Changes to PBS pipeline plugin.  Added a maximum length to the jobname, using a default value of 15 corresponding to the Torque maximum.  Modified the config file to do a local hash check by default.
  fix: avoid stopping of nipype-workflow caused by temporarily suspended LSF-jobs, And changed logfile of lsf-jobs from <lsf_jobid>.out to <scriptname>.log
  Added FSL output type NIFTI to dmri mrtrix example
CHANGES + __init__
fix: resolved conflict
sty: many pep8 fixes
Update

Merge remote-tracking branch 'upstream/master'
Postpone FSL Flirt apply_isoxfm for a different PR
remove deprecated stuff
Fixed tests and docs
Merge pull request #596 from mwaskom/enh/top_level_imports

Import central classes at higher levels in the package hierarchy
Merge pull request #571 from satra/fix/realign_w3dfiles

Fix/realign w3dfiles
Merge pull request #599 from chrisfilo/temp_fix/automask

Temp fix/automask
Merge remote-tracking branch 'bpinsard/spm/reslicetoref'

Conflicts:
	CHANGES
Adding name as a positional argument to pipeline classes
Updating CHANGES
STY: PEP8 in pipeline engine
Also making iterfield positional in MapNode
Reversing the order of the name and iterfield args in MapNode