jekyll 2.x change
copy over master changes
contributing
Merge branch 'gh-pages' into progress