Build system cleanup

Adding some of the npm packages to packages.json and tidying up grunt.js formatting.

Just a heads up, when you install a package with npm, if you use the --save or -S flag, it will automatically add the package to the package.json so it can just be installed with npm install in future