add egg files to gitignore
Merge remote-tracking branch 'upstream/master'
deb_settings no longer required
Merge pull request #5 from vizowl/master

Don't need deb_settings now that settings.py is checked in