Grunt and package.json
Style tweaks, some config stuff