Jon: Beginning to configure Heroku
Jon: Continuing to configure Heroku
Merge remote-tracking branch 'origin/master'