switch to bluebird 2.0 and fix tests