-Update keymap for OSX
-Remove debug code from shorcut_plus