Put the when.js es6 promise shim back in - turns out the latest version works