Replace q with bluebird

Bluebird is pretty awesome...