Fix merge conflicts
Merge branch 'gh-pages' of github.com:davekinkead/davekinkead into gh-pages