General cleanup and working on the gulp tasks.