Replace when with bluebird

Currently has two commits, one for the bulk of the tests conversion and one for the rest.  Will squash if/when this is ready.
Yeah :/  Judgement call I guess.  Was trying to clean these up where they weren't absolutely necessary but there's definitely something to be said for consistency...