Merge "Update tox.ini for sphinx build instructions."