Slight updates
Preparing for heroku deployment
Merge branch 'master' of https://github.com/mvdiener/chipot