Revert previous changes to gruntAllMods
Reapply watch renaming which was undone in a merge
Fix check typo in gruntAllMods
Merge branch 'hotfix/watch'