Lots of documentation updates for 6.0
Merge pull request #294 from peastman/master

Lots of documentation updates for 6.0