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.
PEP8
fix imports
Merge pull request #601 from mwaskom/enh/pipeline_names

name as a positional argument for Workflow and (Map)Node
FIX broken MapNode doctest
Merge pull request #606 from mwaskom/fix/engine_doctest

FIX broken MapNode doctest
Merge pull request #604 from chrisfilo/enh/GLM

Enh/glm
fix: check only the last line in the sge qsub stdout
enh: replace id extraction with regular expression
Merge pull request #613 from satra/fix/sge_tacc

fix: check only the last line in the sge qsub stdout
added back the fstat outputs to fsl flameo interface

Conflicts:

	nipype/interfaces/fsl/model.py