Update for grunt 0.4 rc5/rc6
Merge pull request #2 from tony/gruntv0.4.0-fb2da55

Update for grunt 0.4 rc5/rc6
Merge branch 'master' into develop