Updates for heroku deployment
Merge branch 'master' of heroku.com:stormy-fjord-9653