Fixing all sorts of things that were going wrong with imports#287

marcoeilers wants to merge 4 commits intomastermarcoeilers/nagini:masterfrom

fix_importsmarcoeilers/nagini:fix_importsCopy head branch name to clipboard