docs
change nextTick to setImmediate
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.js
split promise tests into their own file