Edge version of sails depends on edge version of waterline.
MCerge branch 'master' of github.com:balderdashy/sails