Pep8 fixes
Add support for Python 3.4. This breaks with Python 2.6 and before.