Support for upcoming when.js 2.0
Account for asynchrony in aop unit tests
Stop using when.chain where its not really needed
Merge branch 'async-resolutions' into dev
Update to meld 1.2.0 and latest when dev