Merge pull request #3 from pkillian/heroku-SETUP

Heroku setup