tidy up import process
Merged in updated .gitignore