adds jekyllrb style includes
merges changes with local edits for jekyll includes