Moving to support listening on unix sockets
Merging socket support to master