More robust gulp configuration