# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1285087992 14400
# Node ID 2e52cefc189933cf2d3168527ffee13b1925be94
# Parent  da7bdcfffdcbb4d499b0e53b922d437a3aeb982e# Parent  9841a762fa2d8e006c69de101d7df6a15cfab9a2
Merge.

diff -r da7bdcfffdcb -r 2e52cefc1899 vim/.vimrc
--- a/vim/.vimrc	Mon Sep 20 21:47:29 2010 -0400
+++ b/vim/.vimrc	Tue Sep 21 12:53:12 2010 -0400
@@ -1,4 +1,5 @@
 filetype off
+call pathogen#runtime_append_all_bundles()
 filetype plugin indent on
 
 set nocompatible
@@ -67,9 +68,6 @@
 set background=dark
 colorscheme delek
 
-" Use Pathogen to load bundles
-call pathogen#runtime_append_all_bundles()
-
 " NERD Tree
 map <F2> :NERDTreeToggle<cr>
 let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$']