Added socket.io to client (doesn't work sadface), other cleanup stuff