changes filter1 form fsl.FilterRegressor to fsl.GLM
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
Merge pull request #24 from cdla/enh/restingwf

Enh/restingwf