Suggested changes to nipy/nipype#2502#1

vanandrew merged 4 commits intovanandrew:fix_afni_allineatevanandrew/nipype:fix_afni_allineatefrom

effigies:fix_afni_allineateeffigies/nipype:fix_afni_allineateCopy head branch name to clipboard