Reorganized the gulpfile a bit