Upgraded to Socket.IO v1.1
Merged changes