Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages
Tweaks around options and multiple files