Ready for Heroku (again)