major changes, reworking vundle.

bundles.vim

@@ -4,8 +4,6 @@ filetype off
 set runtimepath+=$HOME/.vim/bundle/vundle
 call vundle#rc()
 
-filetype on
-
 Bundle 'gmarik/vundle'
 
 " plugins
@@ -24,11 +22,11 @@ let NERDTreeQuitOnOpen = 1
 let NERDTreeIgnore=['\.pyc$', '\~$', '.svn', '.git', '.hg', 'CVSROOT']
 
 Bundle 'ervandew/supertab'
-let g:SuperTabDefaultCompletionType = "context"
-let g:SuperTabContextDefaultCompletionType = "<c-x><c-o>"
+let g:SuperTabDefaultCompletionType = 'context'
+let g:SuperTabContextDefaultCompletionType = '<c-x><c-o>'
 
 Bundle 'kien/ctrlp.vim'
-let g:ctrlp_working_path_mode = 2 "set working dir to nearest vcs dir
+let g:ctrlp_working_path_mode = 'rw' "set working dir to nearest vcs dir
 
 Bundle 'Lokaltog/vim-powerline'
 let g:Powerline_symbols = 'fancy'
@@ -39,7 +37,7 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'int3/vim-extradite'
 
 " indent
-Bundle 'gg/python.vim'
+Bundle 'hynek/vim-python-pep8-indent'
 
 " syntax
 Bundle 'me-vlad/python-syntax.vim'
@@ -53,5 +51,5 @@ Bundle 'mattikus/textgenshi.vim'
 " colors
 Bundle 'chriskempson/vim-tomorrow-theme'
 Bundle 'altercation/vim-colors-solarized'
-Bundle 'sjl/badwolf'
-Bundle 'tristen/superman'
+
+filetype plugin indent on

vimrc

@@ -1,42 +1,44 @@
-set nocompatible
-
-filetype plugin indent on
 source $HOME/.vim/bundles.vim
 syntax on
 
-set background=dark
+set background=light
 if &t_Co > 16
-  colorscheme mustang
+  colorscheme solarized
 else
   colorscheme desert
 endif
 
-set textwidth=79
+set autoindent
+set autoread
+set backspace=indent,eol,start
+set encoding=utf-8
+set expandtab
 set hidden
+set ignorecase
+set laststatus=2 " always enable statusline
+set mouse=a
+set modeline
+set modelines=5
+set ruler
+set scrolloff=3
+set shiftround
+set shiftwidth=4
+set shortmess=atTIs
 set showcmd
 set showmode
-set encoding=utf-8
-set ruler
-set mouse=a
-set backspace=indent,eol,start
-set wrap
+set smartcase
+set smartindent
+set smarttab
 set softtabstop=4
 set tabstop=4
-set shiftwidth=4
-set expandtab
-set smarttab
-set autoindent
-set smartindent
-set ignorecase
-set smartcase
-set wrapscan
+set textwidth=79
+set timeoutlen=250
 set title
-set wildmenu
-set wildmode=list:longest
-set scrolloff=3
-set shortmess=atTIs
 set verbose=0
-set laststatus=2 " always enable statusline
+set wildmenu
+set wildmode=list,longest
+set wrap
+set wrapscan
 
 " Use the same symbols as TextMate for tabstops and EOLs
 set listchars=tab:▸\ ,eol:¬,trail:⋅,extends:❯,precedes:❮,nbsp:␣
@@ -103,7 +105,7 @@ runtime macros/matchit.vim
 "stuff for vim 7
 if version >= 700
   "set autochdir
-  set completeopt=menuone,longest,preview
+  set completeopt+=preview
   set virtualedit=block
 
   "close the help preview window if moving in or leaving insert mode