Changed event handling to using Thor ActionMaps

Changed std::map keyboardMap into an ActionMap
Merge remote-tracking branch 'origin/master'