baseurl update
Merge branch 'master' into gh-pages

Merge would include:

 - _layout/default.html
 - _config.yml
 - index.html