port to Socket.IO 1.0 and fix the shit
Merge remote-tracking branch 'origin/master'