Merge pull request #49 from kylewm/master

py3 compatibility changes