added handling of output in case where FEAT creates an ica directory rather than a feat directory
Merge branch 'master' of github.com:poldrack/nipype