added a baseurl so links are working on github
Merge branch 'master' into gh-pages