Make links work both locally and on GitHub pages

See http://jekyllrb.com/docs/github-pages/#project_page_url_structure
Merge branch 'master' into gh-pages