vimrc: resolve merge issues
experimental ssh/tmux trick, rename window