Fixes for grunt 0.4
Merge pull request #5 from hull/master

Update for Grunt 0.4