Removed stray heroku file which made it to master
Added some hierarchy to settings to allow easier redefition of local settings.
Updated gitignore to ignore deployment files.