Some doc fixes to make sphinx build cleanly
Merge pull request #694 from psav/docs-update

Some doc fixes to make sphinx build cleanly