Bottle refactor

This refactor makes it easier to use the bottle style
and listen on multiple ports or non-tcp ports. It also
removes a recent patch that contains logic properly
implemented in cyclone user code.