heroku fix
More heroku fixes
More heroku fixes
Merge branch 'master' of heroku.com:whispering-hamlet-9916