Update Gruntfile and build