Refactor the unwieldy tox.ini file.

Fill in some gaps in the coverage (mostly on the python 3 side, and
using more consistent dependencies throughout) and move the 3.x tests
that don't care about a specific 3.x version to 3.3.

This is still less thorough than the travis.yml, which runs everything for
every python version.