updates, various
Merge branch 'gh-pages' of https://github.com/soacom/docs-test into gh-pages