diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1a1dda3..4b5ef49 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -28,6 +28,7 @@ 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' 
+#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' 
+set -g mouse on
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..a3fdf1e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit a3fdf1e3c111e011af09d6d5a6b58517ea4fa6d7
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..e1161a7 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit e1161a723a353db99780f9a9351340df7abbb106
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index d8eb128..e03afa1 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150
+Subproject commit e03afa1733c6296774ca95ef981bd8fd39bb1151
diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes
index 08c76e4..5d75d76 160000
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339
+Subproject commit 5d75d76ca2e17edd68f89ac4f547009d477570c6
diff --git a/vim/.vimrc b/vim/.vimrc
index e8faabf..87cf510 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -43,6 +43,7 @@ nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 " use jj to escape insert mode 
 inoremap jj <Esc>
+inoremap jk <Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
diff --git a/x/.Xresources b/x/.Xresources
index 907ffb6..3bca90f 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -23,8 +23,8 @@
 *color14: #7E9982
 *color15: #BDBDA4
 URxvt*scrollBar:	false
-URxvt.font:     xft:xos4 Terminus:size=14:antialias=true
-URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true
+URxvt.font:     xft:Terminus:size=14:antialias=true
+URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
 URxvt*transparent: true
 URxvt*shading: 10