Applies updates from https://github.com/imathis/octopress/commit/4790b939807be4d9abcc567f02773ff24b99320d