Prepping for Heroku
Merge branch 'master' of https://github.com/Akiorta/emporia