aint nobody got time for heroku
Merge branch 'cleanup'