Update Gruntfile and fix push