merge michaels jekyll version
add any needed new files from michaels jekyll version