remove debugging statements; use relative path for back links
Merge branch 'master' into gh-pages