Make docs build without warnings or errors. Minor additional cleanup.
Merge pull request #1235 from metalivedev/cleandocbld

Make docs build without warnings or errors. Minor additional cleanup.