Clean up and gulp changes
Gulpfile further clean up