Merge pull request #3 from swgillespie/sean

Merge the heroku branch into our master branch