Update trove classifiers to include Py3k.
Fix classifiers.
Merge branch 'master' into stable_py3