Fix 2 errors + 4 warnings (from 10) encountered during sphinx-build to html
Fix further 3 warnings (from remaining 4) from sphinx-build to html
Merge pull request #106 from myii/master

[Live site affected] Sphinx-build to html shows 10 warnings (inc. 2 errors)