Convert to Jekyll 2
Merge pull request #5 from marcqualie/jekyll-2

Jekyll 2