es5 file
Release v0.10.4-1
change log
remove patch specifier from node version in travis config
fix infinite loop when thenable fulfills with itself
Merge branch 'master' into gh-pages

Conflicts:
	js/browser/bluebird.js