Minor py3k and pep8 fixes
Merge pull request #1 from sebasmagri/py3k-pep8-fixes

Minor py3k and pep8 fixes