Merged no-jekyll branch into master properly