Improved key bindings to switch from/to vim/term