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
Merge branch 'master' of github.com:balderdashy/sails into rest-prefix-config