cleaning up
Merge branch 'gh-pages' into talk-brackets