Upgrade to Jekyll 2.2