Updated settings files, push to Heroku
New heroku push
Updates to .gitignore
Merged code review, updated .gitignore, deleted .idea/