Converted to gulp.js
Merge branch 'gulp.js'