Features/heroku

I missed two commits because I can't git. 

You definitely want the first one, open to thoughts on how to make the second one less heroku-specific.