Updating to 1.1.0 + Issue #138 fix

By default the only difference you'll see here is our changes to Bluebird because GitHub is diffing BB master to my branch.