This change causes 308 of the 314 total unit tests to be run (and
run successfully so) under Python 2.7.  This is a first attempt.
We still need to get the doctests included and running.