New headings, minor cleanups
Merge branch 'master' of heroku.com:ohcgo