Some accumulated changes, mostly vim stuff
XCompose additions
FIX TERMINAL KEYS FINALLY

WHY DID I NOT DO THIS EARLIER