Update XKB mappings

Current mappings:

Escape: Escape
Caps Lock: Control
Left Control: Escape

xcape has been removed so the Caps Lock key no longer functions as both
an escape and control key.
Update git rmd command for new git output syntax