Merge branch 'gh-pages'
updated config, default.html
Merge branch 'master' into gh-pages