delete settings.py in git
temp/delete commit
Merge heroku.com:thawing-shelf-8495
pull from origin?
settings.py reborn