Update utils to use six rather than 2to3
Fix test on Python 2.6
Fix test on Python 3.2
Fix typo
Merge pull request #1507 from mdboom/utils/six

Update utils to use six rather than 2to3