diff --git a/.gitignore b/.gitignore
index 9132d67..ebee737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 irssi
 
 vim/bundle/*
-!vim/bundle/vundle
+!vim/bundle/Vundle.vim
 vim/spell
 .netrwhist
diff --git a/.gitmodules b/.gitmodules
index 19c1f6d..7fe50f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "vim/bundle/vundle"]
-	path = vim/bundle/vundle
-	url = git://github.com/gmarik/vundle.git
 [submodule "zsh/zilsh"]
 	path = zsh/zilsh
 	url = git@github.com:zilsh/zilsh.git
 [submodule "zsh/bundle/oh-my-zilsh"]
 	path = zsh/bundle/oh-my-zilsh
 	url = git@github.com:zilsh/oh-my-zilsh.git
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/gmarik/Vundle.vim.git
diff --git a/vim/bundle/vundle b/vim/bundle/Vundle.vim
similarity index 100%
rename from vim/bundle/vundle
rename to vim/bundle/Vundle.vim
diff --git a/vimrc b/vimrc
index 6b2d3d7..8adc014 100644
--- a/vimrc
+++ b/vimrc
@@ -3,28 +3,38 @@ set nocompatible
 
 " Vundle
 filetype off  " required!
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
 
-" My Bundles here:
-"
-" original repos on github
-Bundle 'gmarik/vundle'
-Bundle 'scrooloose/nerdtree'
-Bundle 'pangloss/vim-javascript'
-Bundle 'tpope/vim-fugitive'
-Bundle 'clones/vim-l9'
-Bundle 'clones/vim-fuzzyfinder'
-Bundle 'scrooloose/syntastic.git'
-Bundle 'kien/ctrlp.vim'
-Bundle 'Lokaltog/powerline'
-Bundle 'flazz/vim-colorschemes'
-Bundle 'mileszs/ack.vim'
-Bundle 'airblade/vim-gitgutter'
-Bundle 'editorconfig/editorconfig-vim'
+" let Vundle manage Vundle, required
+Plugin 'gmarik/Vundle.vim'
+
+Plugin 'L9'
+
+Plugin 'clones/vim-fuzzyfinder'
+Plugin 'scrooloose/nerdtree'
+Plugin 'kien/ctrlp.vim'
+Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'}
+
+Plugin 'editorconfig/editorconfig-vim'
+
+Plugin 'pangloss/vim-javascript'
+Plugin 'scrooloose/syntastic.git'
+
+Plugin 'mileszs/ack.vim'
+
+Plugin 'tpope/vim-fugitive'
+Plugin 'airblade/vim-gitgutter'
+
+Plugin 'Lokaltog/powerline'
+Plugin 'flazz/vim-colorschemes'
 
 
-filetype plugin indent on
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+
 
 " enable 256 color !!1!
 set t_Co=256
@@ -229,6 +239,10 @@ nmap <C-Down> ]e
 vmap <C-Up> [egv
 vmap <C-Down> ]egv
 
+" yankstack
+nmap <leader>p <Plug>yankstack_substitute_older_paste
+nmap <leader>P <Plug>yankstack_substitute_newer_paste
+
 " MAIL HUMAN TEX
 au BufNewFile,BufRead *.txt set filetype=human
 au FileType human,mail,tex set expandtab textwidth=78 nocindent