Major rewrite of the Nipype workflows and smaller changes to rest of package