Updated to gulp.js
Merge branch 'gulpjs'