Updated grunt build to use new submodules