adds sorting, cleans up gruntfile