then will be whenever too
Merge branch 'master' of https://github.com/totty90/futures-requirejs

Conflicts:
	future.js