Rework for better Heroku-fu

This should work on Heroku nicely.