Merge pull request #930 from jmaas/master

PEP8 - setup.py