Getting heroku-ready