Doc build fixes

This should clean up the output of the documentation build quite a bit.

Closes #1282