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...)
Merge pull request #1200 from MrJoy/fix_bad_merge

Fix apparent bad merge.
Merge branch '2.1' of git://github.com/imathis/octopress
Update config.