Merge branch 'master' into heroku
Merge pull request #28 from bensheldon/heroku_sync

Sync heroku with master