# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1297217833 18000
# Node ID 2467bc6709cbce66e81c2f4bf7ea9835c52a2fc8
# Parent  864f758f326d18673b6871a7942e2835d1549ec2# Parent  aa91ffa992b9b513736a3d1fa441acacacd25681
Merge.

diff -r aa91ffa992b9 -r 2467bc6709cb vim/.vimrc
--- a/vim/.vimrc	Tue Feb 08 17:00:31 2011 -0500
+++ b/vim/.vimrc	Tue Feb 08 21:17:13 2011 -0500
@@ -37,6 +37,7 @@
 set cpoptions+=J
 set list
 set listchars=tab:▸\ ,eol:¬
+set shell=/bin/bash
 set lazyredraw
 
 " Save when losing focus
@@ -222,6 +223,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
 " }}}