prep for heroku
Merge branch 'master' into heroku-deploy
put secret token in application.yml
Merge pull request #31 from gopher-snakes-2013/heroku-deploy

Heroku deploy