Bump version, and add CHANGES entry
modify tests so that they'll work on python earlier than 3.1
merge fix