Updating package.json, cleaning up gruntfile.js