Add when.js package.
Let step definitions return promises.
Add when package to World.
merged master into mojotech promise commits
fixed package json
fix merge conflicts