Update jQuery, Grunt, and package.json
Fix conflicts w/ previous commit from ages ago