diff --git a/.vim/vimrc b/.vim/vimrc
index 8705a0d..8ae2235 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -1,6 +1,15 @@
 " vim config
 " Ryan Cavicchioni
 
+if has('vim_starting')
+    set nocompatible
+    set runtimepath+=~/.vim/bundle/neobundle.vim/
+end
+
+call neobundle#rc(expand('~/.vim/bundle/'))
+
+NeoBundleFetch 'Shougo/neobundle.vim'
+
 if $MONO != "yes"
     set t_Co=256            " Set to 256 color mode.
     syntax on               " Enable syntax highlighting.
@@ -70,82 +79,78 @@ nmap <silent> <leader>u :GundoToggle<CR>
 
 filetype off 
 
-set rtp+=~/.vim/bundle/vundle
-call vundle#rc()
-
 " Plugins
-Bundle 'gmarik/vundle'
-Bundle 'sjl/gundo.vim.git'
-Bundle 'scrooloose/nerdcommenter.git'
-Bundle 'scrooloose/nerdtree.git'
-Bundle 'msanders/snipmate.vim.git'
-Bundle 'godlygeek/tabular.git'
-Bundle 'tpope/vim-surround.git'
-Bundle 'mattn/gist-vim.git'
-Bundle 'tpope/vim-fugitive.git'
-Bundle 'python.vim'
-Bundle 'kien/ctrlp.vim.git'
-Bundle 'scratch.vim'
-Bundle 'bling/vim-airline'
+NeoBundle 'Shougo/vimproc'
+NeoBundle 'sjl/gundo.vim.git'
+NeoBundle 'scrooloose/nerdcommenter.git'
+NeoBundle 'scrooloose/nerdtree.git'
+NeoBundle 'msanders/snipmate.vim.git'
+NeoBundle 'godlygeek/tabular.git'
+NeoBundle 'tpope/vim-surround.git'
+NeoBundle 'mattn/gist-vim.git'
+NeoBundle 'tpope/vim-fugitive.git'
+NeoBundle 'python.vim'
+NeoBundle 'kien/ctrlp.vim.git'
+NeoBundle 'scratch.vim'
+NeoBundle 'bling/vim-airline'
 
 " Syntax
-Bundle 'ggroenewege/vim-less.git'
-Bundle 'gtpope/vim-haml.git'
-"Bundle 'go'
-Bundle 'gslim-template/vim-slim.git'
-Bundle 'gjuvenn/mustache.vim.git'
-Bundle 'gpuppetlabs/puppet-syntax-vim.git'
+NeoBundle 'groenewege/vim-less.git'
+NeoBundle 'tpope/vim-haml.git'
+"NeoBundle 'go'
+NeoBundle 'slim-template/vim-slim.git'
+NeoBundle 'juvenn/mustache.vim.git'
+NeoBundle 'puppetlabs/puppet-syntax-vim.git'
 
 " Themes
-Bundle 'gjnurmine/Zenburn.git'
-Bundle 'gciaranm/inkpot.git'
-Bundle 'gnanotech/jellybeans.vim.git'
-Bundle 'gguns/jellyx.vim.git'
-Bundle 'gstrange/strange.vim.git'
-Bundle 'gveloce/vim-aldmeris.git'
-Bundle 'galtercation/vim-colors-solarized.git'
-Bundle 'gLokaltog/vim-distinguished.git'
-Bundle 'gnelstrom/vim-mac-classic-theme.git'
-Bundle 'gatonse/vydark.git'
-Bundle 'gvim-scripts/vylight.git'
-Bundle 'gtpope/vim-vividchalk.git'
-Bundle 'gciaranm/inkpot.git'
-Bundle 'gjpo/vim-railscasts-theme.git'
-Bundle 'goguzbilgic/sexy-railscasts-theme.git'
-Bundle 'gmrkn/mrkn256.vim.git'
-Bundle 'gbcat/abbott.vim.git'
-Bundle 'twilight256.vim'                                                                                                                                                                             
-Bundle 'vilight.vim'
-Bundle 'gdasch/vim-mocha.git'
-Bundle 'gdasch/satellite.git'
-Bundle 'gdjjcast/mirodark.git'
-Bundle 'gmolok/vim-vombato-colorscheme.git'
-Bundle 'gjelera/vim-gummybears-colorscheme.git'
-Bundle 'gsjl/badwolf.git'
-Bundle 'gshawncplus/skittles_berry.git'
-Bundle 'Skittles-Dark'
-Bundle 'tortex'
-Bundle 'mayansmoke'
-Bundle 'gsjl/badwolf.git'
-Bundle 'gw0ng/vim-hybrid.git'
-Bundle 'gblackgate/tropikos-vim-theme.git'
-Bundle 'gzaki/zazen.git'
-Bundle 'gjonathanfilip/vim-lucius.git'
-Bundle 'gchriskempson/vim-tomorrow-theme.git'
-Bundle 'gtangphillip/SunburstVIM.git'
-Bundle 'gnelstrom/vim-blackboard.git'
-Bundle 'gtomasr/molokai.git'
-Bundle 'gzeis/vim-kolor.git'
-Bundle 'gmorhetz/gruvbox.git'
-Bundle 'gtrapd00r/neverland-vim-theme.git'
-Bundle 'gchriskempson/base16-vim.git'
-Bundle 'gchangyuheng/holokai.git'
-Bundle 'gryanc/holokai.git'
-Bundle 'gnoahfrederick/Hemisu.git'
-Bundle 'gsk1418/last256.git'
-Bundle 'gtoupeira/vim-desertink.git'
-Bundle 'gjunegunn/seoul256.vim.git'
-Bundle 'lsdr/monokai'
+NeoBundle 'jnurmine/Zenburn.git'
+NeoBundle 'ciaranm/inkpot.git'
+NeoBundle 'nanotech/jellybeans.vim.git'
+NeoBundle 'guns/jellyx.vim.git'
+NeoBundle 'strange/strange.vim.git'
+NeoBundle 'veloce/vim-aldmeris.git'
+NeoBundle 'altercation/vim-colors-solarized.git'
+NeoBundle 'Lokaltog/vim-distinguished.git'
+NeoBundle 'nelstrom/vim-mac-classic-theme.git'
+NeoBundle 'atonse/vydark.git'
+NeoBundle 'vim-scripts/vylight.git'
+NeoBundle 'tpope/vim-vividchalk.git'
+NeoBundle 'ciaranm/inkpot.git'
+NeoBundle 'jpo/vim-railscasts-theme.git'
+NeoBundle 'oguzbilgic/sexy-railscasts-theme.git'
+NeoBundle 'mrkn/mrkn256.vim.git'
+NeoBundle 'bcat/abbott.vim.git'
+NeoBundle 'twilight256.vim'
+NeoBundle 'vilight.vim'
+NeoBundle 'dasch/vim-mocha.git'
+NeoBundle 'dasch/satellite.git'
+NeoBundle 'djjcast/mirodark.git'
+NeoBundle 'molok/vim-vombato-colorscheme.git'
+NeoBundle 'jelera/vim-gummybears-colorscheme.git'
+NeoBundle 'sjl/badwolf.git'
+NeoBundle 'shawncplus/skittles_berry.git'
+NeoBundle 'Skittles-Dark'
+NeoBundle 'tortex'
+NeoBundle 'mayansmoke'
+NeoBundle 'sjl/badwolf.git'
+NeoBundle 'w0ng/vim-hybrid.git'
+NeoBundle 'blackgate/tropikos-vim-theme.git'
+NeoBundle 'zaki/zazen.git'
+NeoBundle 'jonathanfilip/vim-lucius.git'
+NeoBundle 'chriskempson/vim-tomorrow-theme.git'
+NeoBundle 'tangphillip/SunburstVIM.git'
+NeoBundle 'nelstrom/vim-blackboard.git'
+NeoBundle 'tomasr/molokai.git'
+NeoBundle 'zeis/vim-kolor.git'
+NeoBundle 'morhetz/gruvbox.git'
+NeoBundle 'trapd00r/neverland-vim-theme.git'
+NeoBundle 'chriskempson/base16-vim.git'
+NeoBundle 'changyuheng/color-scheme-holokai-of-vim.git'
+NeoBundle 'noahfrederick/Hemisu.git'
+NeoBundle 'sk1418/last256.git'
+NeoBundle 'toupeira/vim-desertink.git'
+NeoBundle 'junegunn/seoul256.vim.git'
+NeoBundle 'lsdr/monokai'
 
 colorscheme last256
 
@@ -158,6 +163,8 @@ inoremap # X#
 let g:airline_left_sep=''
 let g:airline_right_sep=''
 
+NeoBundleCheck
+
 " If it exists, include user's local vim config
 if filereadable(expand("~/.vimrc.local"))
     source ~/.vimrc.local