Fix issues with current implementation

Much simpler logic, but relies on enhancement to `gulp-watch` to expose `trigger` method (pending)