Merge pull request #6 from pyca/python3-fixes

Python 3 fixes.