4f121b1035e8

--- a/vim/.vimrc	Tue Dec 20 17:56:06 2011 -0500
+++ b/vim/.vimrc	Tue Dec 27 15:09:02 2011 -0500
@@ -68,6 +68,8 @@
 set wildignore+=migrations                       " Django migrations
 set wildignore+=*.pyc                            " Python byte code
 
+set wildignore+=*.orig                           " Merge resolution files
+
 " Clojure/Leiningen
 set wildignore+=classes
 set wildignore+=lib
@@ -221,6 +223,10 @@
 nnoremap g; g;zz
 nnoremap g, g,zz
 
+" Window resizing
+nnoremap <c-left> 5<c-w>>
+nnoremap <c-right> 5<c-w><
+
 " Easier to type, and I never use the default behavior.
 noremap H ^
 noremap L g_
@@ -740,6 +746,9 @@
 " Easier linewise reselection
 nnoremap <leader>V V`]
 
+" Jesus, Python.
+inoremap <d-'> _(u'')<left><left>
+
 " Preview Files
 nnoremap <leader>p :w<cr>:Hammer<cr>