Revert "....once more with feeling"

This reverts commit c6232def8419fec792adae89e5daa9f597af0274.
Revert "Revert "....once more with feeling""

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