Code clean-up, improvements to gulpfile

Beginning to make things run a little more smoothly