Merge branch '2.1' of git://github.com/imathis/octopress into 2.1-utc
Merge branch '2.1-utc' of github.com:chrisperelstein/octopress into 2.1-utc-dst