Grunt workflow improvements