From cc8e0fe12c5ad58d54b63d4a509bb6cda2427c14 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Tue, 7 Aug 2012 13:10:45 -0700
Subject: [PATCH] Merge changes from origin/master

Update vimrc
---
 vimrc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vimrc b/vimrc
index db4911b..501922b 100644
--- a/vimrc
+++ b/vimrc
@@ -107,13 +107,12 @@ endif
 " use solarized colorscheme if the terminal can support it (or we're in a GUI)
 let g:solarized_termtrans=1
 let g:solarized_visibility='low'
-if has('gui_running')
+if has('gui')
     set bg=light
-    colorscheme solarized
 else
     set bg=dark
-    colorscheme solarized
 endif
+colorscheme solarized
 
 " tell SnipMate who I am
 let g:snips_author = 'Eryn Wells <eryn@erynwells.me>'
@@ -134,7 +133,7 @@ if has('gui_running')
         set guifont=Inconsolata\ 14
     endif
     set guioptions-=T       " turn off toolbar
-    set guioptions-=m       " turn off toolbar
+    set guioptions-=m       " turn off menubar
 endif
 
 nmap <F3> :GundoToggle<CR>