Completely redid grunt build process