Merge pull request #35 from kylewm/master

Python3 compatibility shims