Fix to key events and change to Gruntfile