pep8 setup in setup.cfg and setup.py pep8 changes
Merge branch 'master' of github.com:MarkusHackspacher/unknown-horizons

Conflicts:
	setup.py
insert tabs delete space