update x11 keyboard mapping and bashrc
cleanup prompt
remove spacebar remapping
fix merge conflict -- use new version of x11_kb_remap