Backport alex/patch-2, Python trove classifiers
Indent/order shuffle, no actionable changes
Forgot python 2.5