WIP: Pull listener into default
WIP: Pull listener into default

Signed-off-by: Rob Dimsdale-Zucker <4df639ba78cac7f8d741d02ef508f2611d6911dd@pivotal.io>

cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard