Added jekyll-contentblocks to the plugins list
fix upgrade docs
Fixed shading on notes, made it less apparent.
Merge pull request #1101 from sankage/upgrade-docs

relative permalinks in upgrade docs are reversed
Update history to reflect merge of #1101.
Simplified based on cobyism suggestion.
Merge pull request #1089 from zachgersh/cobyism_style

Adds margin to code highlights. Tweaks colorscheme of notes.
Update history to reflect merge of #1089.
Make MaRuKu bend to our will.
The CLI command isn't capitalized :)
The --watch has two dashes. Prevent MaRuKu blending them into an emdash.
Merge branch 'add_contentblocks' of git://github.com/rustygeldmacher/jekyll into rustygeldmacher-add_contentblocks

* 'add_contentblocks' of git://github.com/rustygeldmacher/jekyll:
  Added jekyll-contentblocks to the plugins list
Update history to reflect merge of #1068.
Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem

Problem described here: ca888cad76b7816bbe3b004b0b9e7064cfb5215b
Merge pull request #1106 from mojombo/stevenson

Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
Update history to reflect merge of #1106