Promise: renaming broken and eitherWay

To catch and finally. Makes more sense this way and follows the api of Q.