Revert "Tied some orphan rst files into everything.  Broke out some duplicate descriptions into invidivual"

This reverts commit e85bad23.

The commit introduced changes to the docs that does not make a lot of sense. Revert so we can fix the docs generation

Also, adjust the documentation so we can compile the docs correctly