Switch PubSub and EventBus to Promises #10