pep-8-fixes
Merge branch 'master' into wildcard_hosts
Frontend works completed