Bumped to 3.1 in preparation for next release.
Added tag 3.1b1 for changeset 6d9407b6ed35
Testsuite: clean up, and make more use of unittest2 methods