Merge pull request #15 from tseaver/more-py3k-compat

More Python3 compatibility.