Merge with old jekyll branch