Fix merge conflicts.
Fix syntax errors under Python 3.2.
Merge pull request #8 from tseaver/tseaver-py3k_fixes

Remove some Python 3.2 incompatibilities