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