New repost.
Merge branch 'source' of https://github.com/hhiker/octopress into source