Merge in latest Heroku commits; minor typo fixes.