Grunt cleanup

Cleans up some Grunt configuration.