Adding gitattributes to guard this branch's config file
Merge branch 'gh-pages'
Restoring old _config setting
Added scripts dir and post-commit script
Merge branch 'master' into gh-pages