Add *.egg to .gitignore
Sort lines in .gitignore
Merge branch 'master' into imports
Add fix for imports