updated _config.yml and _layouts/default.html
Merge branch 'master' into gh-pages

* master:
  updated _config.yml and _layouts/default.html

merging master into gh-pages