Grunt follow-up

- Fixed missing grunt-cli devDependency, which no longer made it possible to do `node_modules/.bin/grunt test`
- Fixed broken `grunt test-module` commands due to undefined MOCHA_TIMEOUT
- Fixed alphabetic ordering in package.json
- Fixed test that is broken when running with the newframework branch, as the entity widget no longer exists