diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1a1dda3..55f475b 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -29,5 +29,8 @@ set -g mode-keys vi
 # enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
 # copy/paste: shift+left click to highlight, then shift+middle to past
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on; set -g mouse-utf8 on' \
+    'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+
+bind-key Tab last-window
+bind-key BTab previous-window
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
new file mode 100644
index 0000000..66efdea
--- /dev/null
+++ b/vim/.vim/.netrwhist
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/home/jon'
+let g:netrw_dirhist_2='/home/jon/.gnome'
+let g:netrw_dirhist_3='/home/jon'
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index d8eb128..e9a7a12 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150
+Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137
diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround
new file mode 160000
index 0000000..e49d6c2
--- /dev/null
+++ b/vim/.vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313
diff --git a/vim/.vimrc b/vim/.vimrc
index e8faabf..c4269a7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -78,6 +78,7 @@ Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
+Plugin 'tpope/vim-surround'
 
 call vundle#end()            " required
 filetype plugin indent on    " required