Update JS filepaths in Gruntfile.js
Fix bad merge on package.json
Update concatenated and uglified files with new Grunt version