Update pypi classifiers.

Mainly to trigger a read-the-docs build.
Merge branch 'master' into 0.3.0