Update to bluebird 2-ish
Merge pull request #2 from grncdr/master

Update to bluebird 2-ish