extracted diff - broken state
separated sails.io.js from socket.io.js
Merge branch 'sockets' of github.com:Zolmeister/sails into Zolmeister-sockets