Add Sphinx 2.0.4 and make it the default

It's the default version on Ubuntu 12.04 and a stable release.
Did not remove 2.0.1-beta as people are probably using it explicitly.