docs and site changes
Merge branch 'master' into docs