Gulp fixes

@bartvde this was some work I did trying to fix the watch stuff - it cleans it up a bit to be more 'gulpy' but I don't want to cause any regressions and pain. Mind giving it a spin? I also put rimraf in there
@bartvde this was a work-around for when linting stopped working - should be removed.