edited gulp.js for bower
Merge branch 'csv' into dev
commented out merge conflict in bower