Added some investigation to nonempty errors
Merge branch 'bug/fixRemoveNonEmptyDir' into experimental

Conflicts:
	nipype/pipeline/engine.py