small simplifications
Merge branch 'master' of github.com:kevincennis/promise