Merge branch 'master' into bug/fixFUGUEsettings

Conflicts:
	CHANGES
more explicit select files error message
Merge branch 'master' of https://github.com/nipy/nipype.git
Merge pull request #857 from oesteban/bug/fixFUGUEsettings

FUGUE interface refactoring
Merge branch 'master' into experimental

Conflicts:
	CHANGES