Reorg2
Moved socket client, sails.sockets, and new section on resourceful pubsub under 'websockets'
Fixed the grammar of a sentence by adding a missing word.
Merge pull request #187 from Solskido/reorg2

Fixed the grammar of a sentence by adding a missing word.
hoo boy forgot about this stuff
Merge branch 'reorg2' of git://github.com/balderdashy/sails-docs into reorg2
Merge branch 'reorg2'
Formatting
Update Associations overview, manually merge https://github.com/balderdashy/sails-docs/pull/188 resolves #188 fixes #188 ... or something.  one day i'll learn how to tickle github the juuuuust the right way
Merge branch 'master' of github.com:balderdashy/sails-docs