Update gulp version and minor improvements