Proxy source locs

Basic support for proxy source locations.  Also allows websocket server to be invoked as a module, so proxy server and websocket server now start together