add waterline-errors dep
merge master