return the streams so task dependencies work correctly

also broke out watch into its own task
Merge pull request #1 from Contra/patch-1

return the streams so task dependencies work correctly