Merge pull request #80 from Aintaer/master

Promise: rectify the callback signature
trait/promise: adding finally and catch

In order to be able to mixin and have easy api