* forgot to expose when.js to a client instead of Q
Merge remote-tracking branch 'origin/master'