Backing out of a bad octopress update, and fixing problems from my weak git-fu