Upgraded grunt and fixed amd importing of scripts