Update to Jekyll 2.3.0
Fixing merge conflicts