Re-implement grouping by output filename feature, fixes #14; Readme: update gulp-watch example; Refactor tests