Tweak i3 and xsession for i3-centered X11
Change super key and menu key to be super keys both

This works better for i3; for the computers which have neither win/super or menu
we can fall back to the old esc key, which has also been mapped to be an extra
super key.