Jekyll 2 support

Now using Jekyll 2
Fixes #974