Updated workflow and adjusted Grunt tasks