Travis fix (rebased onto develop)



This is the same as gh-808 but rebased onto develop.

----

This PR should restore the `SPHINXOPTS` option in the Travis build, effectively failing PRs breaking the build