wip
Merge branch 'master' of https://github.com/Runnable/dockworker

Conflicts:
	lib/webStreams.js