Partial revert of imoports in nipype namespace
Fix tests that fail with new interface import api
Merge pull request #843 from mwaskom/revert_interface_import

Partial revert of imoports in nipype namespace