changing the way this library determines whether a value is a future or not (for error reporting)
Merge remote-tracking branch 'origin/master'

Conflicts:
	asyncFuture.js