First commit, with some Heroku specific stuff