Merge 'upstream' into gh-pages
Force git to add case-sensitive filename changes
Merge pull request #157 from tpkelly/gh-pages

Fix missing formatters page