Upgrade to Jekyll 2.4
Adapt to Jekyll 2.4