Remove event-stream, replace with merge-stream

see also gulpjs/acceptance#3