Removed last references to Q and changed them to bluebird