move from site.url to site.baseurl
Merge branch 'master' into gh-pages
Update baseurl for gh-pages