Add note to upgrading docs on new config file options.
Merge branch 'master' of git://github.com/beeeswax/jekyll into beeeswax-master

* 'master' of git://github.com/beeeswax/jekyll:
  Add note to upgrading docs on new config file options.
Update history to reflect merge of #1146.
Capitalize all words in titles on Upgrading page in documentation.
Move note about drafts on Upgrading page a bit higher.