More Gruntfile and build cleanup