imathis/octopress — pull request #1200 by MrJoy (2013-04-10 16:25:43+00:00)
Title: Fix apparent bad merge.

(Note that the include block appears earlier in the file, and the explanation of setting pygments to true disappeared at some point...)