Fixed problem with excessive non-promise callbacks
Merge branch 'master' of github.com:tmanderson/Promises