Merge package.json, Gruntfile and .jshintrc fixes