[minor] Start working on a fix for socket.io connection failure with port parsing #49
[fix] Correctly include the querystring
[fix] Make sure we include the query object
Merge branch 'socket.io'