fixed typo on sails-disk dependency for sailsjs.
Merge pull request #1369 from mikedevita/patch-1

fixed typo on sails-disk dependency for sailsjs, relates to #1368
fixed incorrect path for nunjucks require statement
Fixed subscribe calls.
Fixed socket session save() method to persist the SocketIOSession object itself, rather than the original data object that was create along with that object.
Merge pull request #1370 from mogga/v0.10

fixed incorrect path for nunjucks require statement in consolidate.js
Merge branch 'master' of github.com:balderdashy/sails
Merge branch 'v0.10' of https://github.com/balderdashy/sails into feature/mounts-core

Conflicts:
	lib/hooks/session/index.js
Moved code triggering pubsub methods when associated records are changed out of the blueprints and into pubsub
Bound "publishCreate" method on model class object
Moved check for sails.config.blueprints.mirror out of pubsub code and into blueprints
Merge branch 'v0.10' of https://github.com/balderdashy/sails into v0.10
Set "noReverse" argument to true in associated publish calls inside of publishDestroy
Sails debug works, tweaks to grunt
Merge branch 'master' into v0.10
Remove commented-out code in views hook.
Always use NODE_ENV, also some more convenience accessors in view locals
Merge branch 'master' into v0.10
Fixed path to sample app fixtures in integration tests
Fixed blueprint config option and deprecated "--dev" option in httpHelper for integration tests
Removed configuration folder for sample app in integration tests.  Will replace as necessary, using httpHelper methods on a per-test basis when possible.
Re-activated basic blueprint integration tests, and they pass!  Hooray!