Update Grunt and make a few cosmetic changes