# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1411780516 14400
# Node ID c85924edbea760edd2107e4f617b92b0818acdb2
# Parent  70f2c9771fd8ec49a8cebeda9f69bdb3b9b335d5# Parent  a7be2cafd6d720dbac7c69945b1a6497069d7e8e
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -84,6 +84,15 @@ end
   Plugin 'yko/mojo.vim'
 
 
+  try
+    if on_windows == 1
+      source ~/_vimrc.local-pre
+    else
+      source ~/.vimrc.local-pre
+    endif
+  catch
+  endtry
+
   if installed_vundle == 1
     echo "Installing Plugins, please ignore key map error messages"
     echo ""
@@ -394,6 +403,8 @@ if has('gui_running')
   set number
   set background=dark
 
+  set guicursor+=a:blinkwait1000-blinkon1200-blinkoff250
+
   if on_windows == 1
     " generally have a tiling wm on linux
     set columns=120 lines=40