Merge pull request #1033 from jmaas/master

Remove unused variable.
Rebased development environment on EL7, new pyflakes & pep8 tools:

setup.py:220:17: E125 continuation line does not distinguish itself from next logical line
setup.py:240:13: E122 continuation line missing indentation or outdented
setup.py:309:17: E125 continuation line does not distinguish itself from next logical line