diff --git a/vim/settings/yapf.vim b/vim/settings/yapf.vim
new file mode 100644
index 0000000..b810d38
--- /dev/null
+++ b/vim/settings/yapf.vim
@@ -0,0 +1 @@
+autocmd FileType python nnoremap <LocalLeader>= :0,$!yapf<CR>
diff --git a/vim/vundles.vim b/vim/vundles.vim
index 34b0bc8..74fb5d7 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -31,6 +31,7 @@ runtime project.vundle
 runtime vim-improvements.vundle
 runtime go.vundle
 runtime sls.vundle
+runtime python.vundle
 
 " The plugins listed in ~/.vim/.vundles.local will be added here to
 " allow the user to add vim plugins to yadr without the need for a fork.
diff --git a/vim/vundles/languages.vundle b/vim/vundles/languages.vundle
index c509862..8327b04 100644
--- a/vim/vundles/languages.vundle
+++ b/vim/vundles/languages.vundle
@@ -8,4 +8,3 @@ Bundle 'jparise/vim-graphql'
 Bundle 'chr4/nginx.vim'
 Bundle 'derekwyatt/vim-scala'
 Bundle 'scrooloose/nerdcommenter'
-Bundle 'klen/python-mode'
diff --git a/vim/vundles/python.vundle b/vim/vundles/python.vundle
new file mode 100644
index 0000000..3a55217
--- /dev/null
+++ b/vim/vundles/python.vundle
@@ -0,0 +1,2 @@
+Bundle 'klen/python-mode'
+Bundle 'google/yapf'