Revert "Merge branch 'master' of git://github.com/imathis/octopress into source"

This reverts commit 5c0bd87a082142301271d66b2c7996a2340505af, reversing
changes made to c951fa3b7f986c6631d941bcb9db0a0e3fa90156.