Revert sphinx changes

@embray - this reverts the Python 3 fixes you made before (since they break the building of the docs in Python 2), and the tests are now skipped in Python 3. We can then take our time to port the Sphinx code to Python 2 and 3 and ensure that the docs build in both versions.