Beginning changes to update socket.io v1.1.0