Switch zap-to-char with zap-up-to-char, add easier keys for
rotate-layout/window