Fixed keyboard events not firing

From now on events are bound via $el.on() and fired via $el.trigger().

I've also joined the two separate events together as it makes since to have all the key cases under one roof.