Add missing Mocha testing dependency
Simplify test harness by moving testing deps into devDependencies
Merge pull request #1432 from ndhoule/fix/travis

Add missing Mocha test dependency
Merge pull request #1433 from ndhoule/refactor/simplify-test-deps

Simplify test harness by moving testing deps into devDependencies
Merge branch 'master' of github.com:balderdashy/sails into fix/load-test-error

Conflicts:
	package.json