# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1280513058 14400
# Node ID 91321483b46496825f7a9876c9a7264230f890f0
# Parent  8ac636ddb389e5dfcbba08a2e385b37bbb12dc0d# Parent  b3642d06bd41b20104a1a44b56e588501494ed16
Merge.

diff -r 8ac636ddb389 -r 91321483b464 vim/.vimrc
--- a/vim/.vimrc	Fri Jul 30 14:01:00 2010 -0400
+++ b/vim/.vimrc	Fri Jul 30 14:04:18 2010 -0400
@@ -3,6 +3,9 @@
 
 set nocompatible
 
+" Security
+set modelines=0
+
 " Tabs/spaces
 set tabstop=4
 set shiftwidth=4
@@ -203,3 +206,6 @@
 
 " Rainbows!
 nmap <leader>R :RainbowParenthesesToggle<CR>
+
+" Edit .vimrc
+nmap <leader>V <C-w><C-v><C-l>:e $MYVIMRC<cr>