Documentation fixes

Rebased version of #2217 - opening a PR to test on Travis since I'm getting weird failures locally