A bit of cleanup
some more preparatory Heroku deployment stuff