fix imports
Added XOR condition between apply_isoxfm and apply_xfm
Merge pull request #605 from mick-d/master

Add missing option apply_isoxfm to FSL Flirt wrapper
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
Prevent warning issued from wrong version of Dipy constrained by tensors.py
Merge pull request #604 from chrisfilo/enh/GLM

Enh/glm
Changed the config_file input under FNIRT Inputspec to take in a String instead of an Enum type. This way a custom FSL FNIRT config file can be used.
fix: check only the last line in the sge qsub stdout
BUG: initial_moving_transform_com needs default

The initial_moving_transform_com needs to be defaulted
to false in order to maintain backwards compatibility.

When this is not default = False, it results in

initial_moving_transform = <undefined>
initial_moving_transform_com = <undefined>

Error:
Registration requires a value for input 'invert_initial_moving_transform' because one of initial_moving_transform is set. For a list of required inputs, see Registration.help()

Adding try catch block to ensure that conversions occur properly, or use defalut behavior
if boolean is undefined.

File "/Shared/sinapse/sharedopt/20130601/RHEL6/DTIPrep/BRAINSTools-build/NIPYPE/nipype/interfaces/ants/registration.py", line 471, in _format_arg
int(self.inputs.invert_initial_moving_transform))
TypeError: int() argument must be a string or a number, not '_Undefined'
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
Added human order sorting for FLAMEO outputs, fixed abspath for Cluster
outputs.
PEP8
Merge pull request #615 from chrisfilo/enh/FLAMEO

Enh/flameo
added handling of output in case where FEAT creates an ica directory rather than a feat directory
Merge pull request #614 from BRAINSia/FixAntsRegistrationRegression

BUG: initial_moving_transform_com needs default
Merge pull request #579 from FredLoney/ants_multiple_metrics_per_stage

Support multiple metric arguments per stage.