merge in some changes from Heroku
Use '```' instead of '~~~~' in docs for code blocks.