Switch promises from Q to Bluebird
Merge pull request #487 from thejameskyle/switch-to-bluebird

Switch promises from Q to Bluebird