socket.io upgrade
Merge pull request #291 from chris-held/socketio

socket.io upgrade