updated relative links

Updated relative links to work with Github Pages
Merge branch 'master' into gh-pages