Added changes from old jekyll repo, for reals this time.