Fix task execution dependencies when running gulp watch