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

This reverts commit ff374ab6edaac196a01930098b85528322e2070e, reversing
changes made to 09522de04119a580ca0b586117704fd901d1fde1.