Fix dos by possibly creating many intervals
Merge branch 'master' into fast

Conflicts:
	lib/socket.js
Finish simple buffering