Start off my bringing over what I did over in sails-disk
Ensure collections get dropped.
Older npm compat, depend on waterline-cursor, remove merge-defaults
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json