Fix dependency for npm 2.0.0
Merge branch 'patch-1' of github.com:Globegitter/sails into Globegitter-patch-1
Merge branch 'Globegitter-patch-1'
Merge pull request #2291 from rjclardy/master

Upgrade express to close security vulnerabilities
Force at least WL@0.10.11
Resolve merge conflict in package.json from separate prs.
Resolves mismatch here (https://github.com/balderdashy/sails/pull/2291#issuecomment-58809939)
see https://github.com/balderdashy/sails/pull/2291#issuecomment-58810625