Revert "Merge branch 'master' of github.com:oesteban/nipype"

This reverts commit ce5c4b448a2918d002803e83b52fe9c6b7ac2348, reversing
changes made to 24c643d225e899ef6829e43adbbf7b5cc305fa49.

Conflicts:
	CHANGES
	nipype/__init__.py
	nipype/algorithms/misc.py
	nipype/interfaces/__init__.py
	nipype/interfaces/ants/registration.py
	nipype/interfaces/fsl/model.py
Revert "Merge pull request #544 from margulies/master"

This reverts commit 40a940436971dc1eeca0c8681b8b9f4f70003176, reversing
changes made to d8f757a924eca5bf96bc31f8344dec6ae2734c9f.