Jekyll 2

Finally upgrading to Jekyll 2 after months and months of neglect