Revert "Merging from master"

This reverts commit b5426f718af524e2e6fbe2894646eae56aeac215, reversing 
changes made to 0c754202e3058f03c3a3593aa4259505731cea6b.

It looks like b5426f7 accidentally merged the master branch into this gh-pages
branch, so I'm backing it out here.