Fix Grunt and get build and distribution working