updated for socket.io 1.0
Merge commit: updated for socket.io 1.0

Conflicts:
	lib/index.coffee