version_0.2.0
Changed version number, Merge branch 'master' into development

Conflicts:
	CPAC/__init__.py
Update config.yml

Added fnirtConfig parameter for the registration workflow and the FSL FNIRT input parameter config_file.

See Nipype documentation for details:
http://nipy.sourceforge.net/nipype/interfaces/generated/nipype.interfaces.fsl.preprocess.html

FNIRT inputs, config_file:

"config_file: ('T1_2_MNI152_2mm' or 'FA_2_FMRIB58_1mm' or an existing file name)
        Name of config file specifying command line arguments"
Update config.yml

Added additional documentation to the fnirtConfig parameter.
Fixed docstrings and added compatibility with nipype master (fsl.GLM)
Merge pull request #207 from chrisfilo/fix/GLM

Fixed docstrings and added compatibility with nipype master (fsl.GLM)
Update __init__.py

Incremented version to 0.3.2.
Update __init__.py
fixed merge
Merge pull request #252 from sgiavasis/master

Removed unneeded testing code that introduced a potential for an error.
Merge pull request #253 from sgiavasis/master

Removed some checks for the temporarily-disabled categorical/continuous group analysis EV type parameters.
Merge pull request #254 from sgiavasis/master

Amended group analysis EV types parameter hard coding.
Consolidated changes for 0.3.2 release.
Temporarily removed 'On & Off' option for Scrubbing.
Merge pull request #266 from FCP-INDI/0.3.2_release

0.3.2 release
Create config_parameters.txt

Used to check for missing elements in old pipeline config.yml files.
Update utils.py
Merge pull request #267 from FCP-INDI/0.3.2_release

Removed potential error while trying to read average_snr_file.txt.
Removed potential error while trying to read average_snr_file.txt.
Updated developer documentation - no functionality changed.