Merge branch 'master' into gh-pages
Revert "Add baseUrl as recommended by Jekyll docs"

This reverts commit d39c164876aa4db801ce6a8b1b639fee64383b17.
Merge branch 'gh-pages'