Remove auto initialize of socket.io as it's error prone
Merge remote-tracking branch 'origin/master'