Pablo vallejo gulp

Seeing no activity on the pull request, I resolved #728, by fixing the merge conflict in it. All credit goes to @PabloVallejo for integrating GulpJs into this project.
Looks like a typo here