Merge pull request #6 from nipy/master

Update my fork of nipype
Introduced an interface for ANTS command LaplacianThickness.
Merge pull request #7 from nipy/master

Update my fork of nipype.
Added 1dmatrix_save parameter option to 3dvolreg interface.
Modified tpattern input to allow for strings (paths) and not just the 'alt-z' parameters
Modified tpattern input to allow for strings (paths) and not just the standard acquisition patterns
Added note of ANTs LaplacianThickness enhancement to CHANGES
Reverted _overload_extenstion function argument in ../interfaces/afni/preprocess.py
Merge remote-tracking branch 'origin/pr/868'

Conflicts:
	CHANGES
fixed doctest