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
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
added FSLGLM

Conflicts:

	nipype/interfaces/fsl/__init__.py
	nipype/interfaces/fsl/model.py
Merge and clean up FSLGLM into GLM.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	nipype/interfaces/afni/preprocess.py
Add missing option apply_isoxfm to FSL Flirt wrapper
PEP8
Solve merge issue
Solve Merge issue