Make improvements to Grunt workflow