FIX: revert docs and fix for py3 compat
Merge pull request #4419 from cpcloud/fix-doc-imports

FIX: doc imports