Fixed missing devDependency for grunt-cli, fixed broken test on newframework branch
Merge pull request #402 from nicolaasmatthijs/grunt-followup

Grunt follow-up