General Fixes to documentation
Merge branch 'gh-pages-staging' into gh-pages