Gruntfile and package fixes