Added "sails-hook-sockets" as a dep
Turned off tests checking for conflicting hooks
Use parseSocket and remove backwards compat for 0.9 clients (stopped working)
New method for lifting two sockets
Clean up "before" and "after" blocks
Workaround for issue with sails-generate and sails.io.js
Reactivate all tests
Removed socket.io.js dev dependency, added file directly
This should put those pesky sails-generate issues in the tests to bed.
Revert "Workaround for issue with sails-generate and sails.io.js"

This reverts commit b0558b03944b9c0a27726c3fa0544bf002e723bc.
Update migration guide
Merge branch 'master' of github.com:balderdashy/sails
Update migration guide to be accurate.
v0.11.0-rc2
Use at least version 0.11.8 of sails-hook-sockets
v0.11.0-rc3
Update 0.11-migration-guide.md
Merge pull request #3 from balderdashy/master

update from upstream