Adding gulpfile and moving to gulp for builds
Handling ugly merge conflicts