[FIX] fixed bad merge
[PEP8] in setup.py
Merge branch 'pep8' into cleaned-alfa

Conflicts:
	setup.py