Function Automask raises error due to string '-apply_prefix <undefined>' generated in the 3dAutomask command
Merge remote-tracking branch 'upstream/master'
Added the option for resampling with isotropic voxels as available in FLIRT but not wrapped in NiPype
fixed some problems when you did not dilate, a file ROIv was expected which was not created. Further the format of the file was transformed to PEP8
added check for dilation==TRUE to ROIv outputs
Update

Merge remote-tracking branch 'upstream/master'
Postpone FSL Flirt apply_isoxfm for a different PR
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
Updating pipeline docstrings
base_dir in Workflow
Updating CHANGES
Merge pull request #598 from alexschaefer83/master

Fix for Dilation
doc: fixed building with Sphinx 1.2
Merge pull request #603 from satra/fix/docbuild

doc: fixed building with Sphinx 1.2
added FSLGLM

Conflicts:

	nipype/interfaces/fsl/__init__.py
	nipype/interfaces/fsl/model.py
Merge and clean up FSLGLM into GLM.