Made it Heroku ready