nipy/nipype — pull request #647 by satra (2013-09-08 22:55:47+00:00)
Title: Fix/cherrypicked

cherrypicked fixes from the resting PR.