A couple of the heroku things, hack for DATABASE_URL environ variable, rushed push though so things are probably broken