Remove complicated timeout interface and just use bluebird

Easier to read, and reduces unnecessary complexity.  Win/win in my book.