jekyllified
Merge branch 'master' into jekyll