Misc. content edit.
Merge branch 'master' of https://github.com/joethe/joethe.github.io