Support new files:[ {pattern: '...', watched: false, ...}] style in grunt config.

Trying to stay up to date here, I created a function to merge the files array both from the task global options and the task target options, then process those listings to support the new 'pattern' style.  Updated the grunt file to show how this can be used and ran all tests... passed.

    % grunt test
    Running "karma:continuous" (karma) task
    INFO [karma]: Karma v0.10.1 server started at http://localhost:9876/
    INFO [launcher]: Starting browser Chrome
    INFO [Chrome 28.0.1500 (Mac OS X 10.8.4)]: Connected on socket id qtFM_PVcgj0d5KAXpqeH
    LOG: 'one'
    LOG: 'two'
    Chrome 28.0.1500 (Mac OS X 10.8.4): Executed 2 of 2 SUCCESS (0.082 secs / 0.002 secs)

    Done, without errors.

what can I do to get this PR accepted?
thanks.