Now using Jekyll
Merge branch 'jekyll'