Merge pull request #252 from jenius/when3

Add tests for promise.else
Fix browser testing for es5 browsers by adding lib/ dir to buster resources
Test using es5-shim for legacy browser testing support
Minor reorg, use done
Remove old branch from travis run
Split makePromise into feature decorators
Tweak naming
Tweak naming
Use then as flatMap for now