Heroku-ready :P

Merged with the latest working version on Heroku.