Cleaning up grunt usage

[NickHeiner]

The deps in package.json are reordered by npm because I did npm install --save-dev.

These are just some best practices and general cleanup changes. Let me know if you want explanation on any of them.