Auto-deploy to heroku, and some minor cleanup