From 1b1e8f242ada4258e5888322ceb1e89347fb69b8 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <hsaxberg@yelp.com>
Date: Tue, 2 Jun 2015 11:43:52 -0700
Subject: [PATCH] update vundle, ohmyzsh; remove python-mode from vim plugins

---
 vim-files/vim/bundle/vundle |  2 +-
 vim-files/vimrc             | 31 +++++--------------------------
 zsh-files/oh-my-zsh         |  2 +-
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/vim-files/vim/bundle/vundle b/vim-files/vim/bundle/vundle
index 8db3bcb..cfd3b2d 160000
--- a/vim-files/vim/bundle/vundle
+++ b/vim-files/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5
+Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933
diff --git a/vim-files/vimrc b/vim-files/vimrc
index 240ba96..7d5979e 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -20,7 +20,6 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'scrooloose/nerdtree'
 Bundle 'tomtom/tcomment_vim'
 Bundle 'tpope/vim-characterize'
-Bundle 'klen/python-mode'
 Bundle 'jonathanfilip/vim-lucius'
 Bundle 'nanotech/jellybeans.vim'
 Bundle 'majutsushi/tagbar'
@@ -43,31 +42,11 @@ filetype plugin indent on     " required
 
 """" PLUGIN SETTINGS
 
-""" Python-Mode settings
-let g:pymode_lint = 0
-let g:pymode_lint_checker = "pyflakes"
-
-" don't complete with rope
-let g:pymode_rope_completion = 0
-let g:pymode_rope_autoimport = 0
-
-" don't usually care about documentation
-let g:pymode_rope_lookup_project = 0
-
-" better definition keybind
-let g:pymode_rope_goto_definition_bind = 'K'
-
-let g:pymode_breakpoint_cmd = 'import ipdb;ipdb.set_trace() # FIXME: breakpoint!'
-
-" syntax highlighting
-let g:pymode_syntax = 1
-let g:pymode_syntax_all = 1
-let g:pymode_syntax_indent_errors = g:pymode_syntax_all
-let g:pymode_syntax_space_errors = g:pymode_syntax_all
-
-" don't autofold code
-let g:pymode_folding = 0
-""" End Python-Mode settings
+" YouCompleteMe
+nnoremap K :YcmCompleter GoTo<CR>
+nnoremap ˚ :YcmCompleter GoToDeclaration<CR>
+let g:ycm_goto_buffer_command = 'horizontal-split'
+let g:ycm_autoclose_preview_window_after_insertion = 1
 
 " Syntastic
 let g:syntastic_python_checkers = ['pyflakes', 'pep8', 'pep257']
diff --git a/zsh-files/oh-my-zsh b/zsh-files/oh-my-zsh
index 3913106..1400346 160000
--- a/zsh-files/oh-my-zsh
+++ b/zsh-files/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 3913106b2e7127d396f27b652df812340ec0c871
+Subproject commit 140034605edd0f72c548685d39e49687a44c1b23