Pep8 and Python3
Couple more compatibility changes.
Merge pull request #1 from chadheyne/master

Compatibility changes