Prep for v2.2.0 release.
Merge pull request #2643 from jekyll/v2-2-0-release