Minor cleanup
Merge branch 'dev' of github.com:cujojs/when into dev

Conflicts:
	when.js