Grunt build system changes