Fix gulp task ordering