Jekyll 2.0, with @imathis's changes.

/cc https://github.com/imathis/octopress/pull/1589
I think I'll probably add this to the Octopress 2.0 install so it will reach feature parity with the current release. That was my intention anyway.