Upgrading to Jekyll 2.2, minor fixes