Improve package.json
Improve Gruntfile