diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 8e8adcc..1a1dda3 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,10 +9,6 @@ bind - split-window -v
 unbind '"'
 unbind %
 
-# 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
-set -g mouse on
-
 # stop tmux from renaming the window every time you run a command
 set-option -g allow-rename off
 set-option -g pane-active-border-fg blue
@@ -29,3 +25,9 @@ set -g base-index 1
 # set vi modes
 set -g status-keys vi
 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 mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index e9a7a12..d8eb128 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137
+Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150