gulpfile improvements to isolate files across watch tasks