Prepare for heroku deployment
Merge branch 'lea-prepare-for-heroku'

* lea-prepare-for-heroku:
  Prepare for heroku deployment