pep-8-fixes
Merge HEAD, branch 'wildcard_hosts' of github.com:dploeger/skd into wildcard_hosts