Massaging for a more heroku-friendly configuration