Merge pull request #23 from cdla/enh/restingwf

updated changes!
fix: parameters, node types
enh: use voxel dimension were erosion and smoothing, pep8 cleanup
changes filter1 form fsl.FilterRegressor to fsl.GLM
added dewarp and datasink format
Merge branch 'enh/restingwf' of https://github.com/cdla/nipype into enh/restingwf

Conflicts:
	examples/rsfmri_preprocessing.py