Pygments does not need to be installed. Fixes #1099 #1119
Merge branch 'master' of github.com:mojombo/jekyll

* 'master' of github.com:mojombo/jekyll:
  Update history to reflect merge of #1116
  Removed space characters in empty lines