Tidied up gulpfile.js and fixed watch issue