extracted diff - broken state
separated sails.io.js from socket.io.js
Merge pull request #572 from Zolmeister/development

fixed issue #569
Re-added back in res.view layout attribute.
Fixed utils in configuration/build.js
Closes #570
Merge pull request #573 from dubcanada/development

Re-added back in res.view layout attribute.
Merged and extended support of custom layout issues, as well as allowing view locals to be passed as either the first or second arg.
Missing util/_ refactor.
More explanation around layouts.
More clarity on view engine support.
Implements full filename-style declaration of adapters in model config.  Closes https://github.com/balderdashy/sails/issues/539
cleaned up sails generate boilerplates
Updated controller and action boilerplates.
Added better fault tolerance for ornery custom adapters.
Cleaned up blueprints, added consistent error handling using new 500 and 404 handlers.
gls
Improved error page and fixed req.wantsJSON (also added req.explictlyAcceptsHTML)
Refactored boilerplates
More boilerplate cleanup.
Moved csrf default config.. er.. back to .config.csrf again.  Sorry, @zolmeister.