Add vim-tmux-navigator mappings, tidy up config session