improved waterline promise chaining

Added promise chaining in waterline using [Q](https://github.com/kriskowal/q).