Fix glob patterns in watch tasks.
Rename grunt sub task to be consistent with other projects.