# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1297296344 18000
# Node ID eb6884839822d350f610288cd0ba74dac1057518
# Parent  2467bc6709cbce66e81c2f4bf7ea9835c52a2fc8# Parent  f72bf0f65204849d0c734837c89d34791b75a678
Merge.

diff -r f72bf0f65204 -r eb6884839822 vim/.vimrc
--- a/vim/.vimrc	Wed Feb 09 16:27:20 2011 -0500
+++ b/vim/.vimrc	Wed Feb 09 19:05:44 2011 -0500
@@ -38,6 +38,7 @@
 set cpoptions+=J
 set list
 set listchars=tab:▸\ ,eol:¬
+set shell=/bin/bash
 set lazyredraw
 
 " Save when losing focus
@@ -234,6 +235,7 @@
 " }}}
 " Django {{{
 au BufNewFile,BufRead urls.py      setlocal nowrap
+au BufNewFile,BufRead urls.py      normal! zR
 au BufNewFile,BufRead settings.py  normal! zR
 au BufNewFile,BufRead dashboard.py normal! zR
 " }}}