Update to run npm test with fails
Merge branch 'master' of github.com:tskaggs/sails-parse

Conflicts:
	lib/adapter.js
	lib/connection.js
	package.json