Updated the gruntfile to accurately use concat and uglify