Additional fixes for py3k
Merge pull request #31 from spulec/master

Additional fixes needed for py3k