Jekyll 2.0, with @imathis's changes.