Tidied up imports

Much tidier like this. No more DRY violations!
Sorted to one input per line
Merge pull request #175 from phalt/import-tidy

Tidied up imports