Reorganize for Heroku
Merge branch 'master' of github.com:brianhou/shiny-octo-batman