A few doc related updates
Merge pull request #894 from jbertram/master

Doc updates