Cleaned up #includes
Added sugar method for generating sockets in a SocketManager