using gulpfile and cleaned up js
fix merge conflict from jsx branch