comprehensive updates to documentation
more updates to docs
Merge branch 'dev' into 2.7-dev