Heroku changes

Changes from the heroku setup stuff.