Updated to Gulp.js
Merge branch 'gulpjs'