Merge pull request #19 from kylewm/master

Compatibility shims for Python 3.3.4