Fix gulp watch task
Rationalise the gulp JS tasks a little