Updated so both python 2.7 and 3.2 pass the tests.
Updating to relieve conflicts.