# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1406823639 14400
# Node ID 52145be176c255c83050762c5bb46c580ac5cdc8
# Parent  36096e4c56130459e7566b18e8df7f1525288efe# Parent  dff13372e8306777cbfdf50cd7cfb03ecdc032d5
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -382,14 +382,25 @@ if has('gui_running')
 
   colorscheme solarized
 else
-  if &t_Co == 256
-    colorscheme jellybeans
-  end
+
+  if $TERM =~ 'screen'
+    if $TERM == 'screen-bce'
+      "if i'm not screen-bce, i'm not sure i have a good .screenrc in place
+      set t_Co=256
+    endif
+
+    set mouse=a
+  endif
 
   if $TERM =~ 'rxvt-unicode'
     set ttymouse=urxvt
     set mouse=a
   endif
+
+  if &t_Co == 256
+    colorscheme jellybeans
+  end
+
 end