swapping in bluebird, some promise cleanup
cleanup on the .then interface
Merge branch 'bluebird'

* bluebird:
  cleanup on the .then interface
  swapping in bluebird, some promise cleanup