make listen ip configurable
Merged conflicts for listen_ip stuff