pep8 changes
E701 multiple statements on one line (colon)
E231 missing whitespace after ','
pep8 setup in setup.cfg and setup.py pep8 changes
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
Merge pull request #2289 from MarkusHackspacher/master

pep8 changes