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.
I don't think this comment is necessary. (it's also no longer correct :P)