server config based on combined vhost and listener config
fix typo s/enterface/interface/
Merge branch 'bugfixes' into rabe
Merge branch 'server' into rabe