Update several things to match holman's more closely
Add heroku