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.
Merge branch 'master' of https://github.com/nipy/nipype into nipy-master

Conflicts:
	nipype/interfaces/fsl/preprocess.py
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
AFNI issue
Merge remote-tracking branch 'upstream/master'
AFNI fixed by latest master
Merge remote-tracking branch 'upstream/master' into fix/reporting

* upstream/master:
  fixed more bugs
  fixed doctests
  fixed refit
Merge remote-tracking branch 'upstream/master' into fix/reporting

* upstream/master:
  Fixed typos and paths
fix: updating internal prov to upstream master
enh: adding coveralls
enh: adding coveralls
fix: missing component of travis config
fix: simplify coverage call
fix: testing coverall configuration
Correct PEP8
fix: limit text literal in provenance to 1MB
Add FSFAST option to RapidArt
Merge pull request #706 from effigies/fsfast

Add FSFAST parameter source to ArtifactDetect
add: support for setting TR in fsl.Merge