Promise additions post merge conflicts from Scenario Outlines/Dev over the last 6 months. 

I've been using wkf's promise additions to cucumberjs, and merged in cucumber-js master's stuff yesterday. This should be a fastforward merge to add in these optional niceties.