Move packaging meta-data around a little bit
Fix tests on Python 2.6