Tidied up package.json and Gruntfile