Jekyll 2.0, with @imathis's changes.

/cc https://github.com/imathis/octopress/pull/1589