Fix a couple of the more egregious formatting issues
Merge branch 'master' into gh-pages