Merge pull request #723 from pganssle/pep8_setup_py

Fix Python 3.3 tests, make setup.py PEP 8 compliant