Update vim-settings and add tmux-navigator and tmux-line support