Rearrange gemfile for heroku
Merge branch 'master' of github.com:pcrglennon/justin-peter
Remove timeout function