diff --git a/Makefile b/Makefile
index 16f4a7a..6c5b32a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,5 +5,4 @@ install:
 	mkdir -p ~/.vimbackups
 	mkdir -p ~/.vim/bundle
 	ln -sf ~/.vim/vimrc ~/.vimrc
-	vim -c 'BundleInstall' -c 'qa!'
- 
+	vim -c 'PluginInstall' -c 'qa!'
diff --git a/bundle/vundle b/bundle/vundle
index c52de21..8db3bcb 160000
--- a/bundle/vundle
+++ b/bundle/vundle
@@ -1 +1 @@
-Subproject commit c52de216a4a12a09ccc6a45af75a1e463ddd477d
+Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5
diff --git a/vimrc b/vimrc
index 4407be9..6fdb058 100644
--- a/vimrc
+++ b/vimrc
@@ -1,47 +1,50 @@
 set nocompatible
 filetype off
 
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
 
 " let Vundle manage Vundle
-" required! 
-Bundle 'gmarik/vundle'
+" required!
+Plugin 'gmarik/vundle'
 
 " My Bundles here:
 "
 " original repos on github
-Bundle 'tpope/vim-fugitive'
-Bundle 'scrooloose/nerdtree'
-Bundle 'mileszs/ack.vim'
-Bundle 'FuzzyFinder'
-Bundle 'taglist.vim'
-Bundle 'Gist.vim'
-Bundle 'L9'
-Bundle 'kien/ctrlp.vim'
-Bundle 'VimClojure'
-Bundle 'tpope/vim-surround'
-Bundle 'scrooloose/nerdcommenter'
-Bundle 'duskhacker/sweet-rspec-vim'
-Bundle 'tpope/vim-markdown'
-Bundle 'tpope/vim-haml'
-Bundle 'tpope/vim-rails'
-Bundle 'confluencewiki.vim'
-Bundle 'majutsushi/tagbar'
-Bundle 'vim-orgmode'
-Bundle 'vim-ruby/vim-ruby'
-Bundle 'matchit.zip'
-Bundle 'CSApprox'
-Bundle 'timcharper/textile.vim'
-Bundle 'jimenezrick/vimerl'
-Bundle 'rson/vim-conque'
-Bundle 'Lokaltog/vim-powerline'
-Bundle 'myusuf3/numbers.vim'
-Bundle 'altercation/vim-colors-solarized'
-Bundle 'scrooloose/syntastic'
-Bundle 'JSON.vim'
-
-filetype plugin indent on     " required! 
+Plugin 'tpope/vim-fugitive'
+Plugin 'scrooloose/nerdtree'
+Plugin 'mileszs/ack.vim'
+Plugin 'FuzzyFinder'
+Plugin 'taglist.vim'
+Plugin 'Gist.vim'
+Plugin 'L9'
+Plugin 'kien/ctrlp.vim'
+Plugin 'VimClojure'
+Plugin 'tpope/vim-surround'
+Plugin 'scrooloose/nerdcommenter'
+Plugin 'duskhacker/sweet-rspec-vim'
+Plugin 'tpope/vim-markdown'
+Plugin 'tpope/vim-haml'
+Plugin 'tpope/vim-rails'
+Plugin 'confluencewiki.vim'
+Plugin 'majutsushi/tagbar'
+Plugin 'vim-orgmode'
+Plugin 'vim-ruby/vim-ruby'
+Plugin 'matchit.zip'
+Plugin 'CSApprox'
+Plugin 'timcharper/textile.vim'
+Plugin 'jimenezrick/vimerl'
+Plugin 'rson/vim-conque'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'scrooloose/syntastic'
+Plugin 'JSON.vim'
+Plugin 'elixir-lang/vim-elixir'
+Plugin 'kien/rainbow_parentheses.vim'
+Plugin 'bling/vim-airline'
+Plugin 'chriskempson/base16-vim'
+
+call vundle#end()
+filetype plugin indent on     " required!
 "
 " Brief help
 " :BundleList          - list configured bundles
@@ -67,12 +70,13 @@ set autoindent
 " Use spaces instead of tabs
 set expandtab
 set background=dark
-colorscheme twilight 
+colorscheme base16-default
+"colorscheme twilight
 " colorscheme solarized
 if has("gui_gtk2")
-  set guifont=Inconsolata\ 12
+  set guifont=Inconsolata\ for\ Powerline\ 12
 else
-  set guifont=Inconsolata:h16
+  set guifont=Inconsolata\ for\ Powerline:h16
 endif
 set ignorecase
 set vb " turns off visual bell
@@ -91,8 +95,7 @@ set statusline+=%<%P                         " file position
 
 compiler ruby
 
-
-let g:fuzzy_ignore = "*.log" 
+let g:fuzzy_ignore = "*.log"
 let g:fuzzy_matching_limit = 70
 let mapleader=","
 let maplocalleader=","
@@ -105,10 +108,15 @@ let g:gist_detect_filetype = 1
 let g:tagbar_autofocus = 1
 
 let g:vimclojure#ParenRainbow = 1
-let g:vimclojure#HighlightBuiltins = 1 
+let g:vimclojure#HighlightBuiltins = 1
 let g:vimclojure#WantNailgun = 1
 let python_highlight_all = 1
-let g:Powerline_symbols = 'fancy'
+let g:airline_powerline_fonts = 1
+" let g:Powerline_symbols = 'fancy'
+" set rtp+=/Users/adam/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim
+
+set listchars=tab:>\ ,trail:•,extends:>,precedes:<,nbsp:+
+set list
 
 map <right> :bn<cr>
 map <left> :bp<cr>
@@ -197,16 +205,20 @@ autocmd BufRead *\.txt map k gk
 autocmd BufRead *\.txt setlocal smartindent
 autocmd BufRead *\.txt setlocal spell spelllang=en_us
 
-au! BufRead,BufNewFile *.json set filetype=json 
-augroup json_autocmd 
-  autocmd! 
-  autocmd FileType json set autoindent 
-  autocmd FileType json set formatoptions=tcq2l 
-  autocmd FileType json set textwidth=78 shiftwidth=2 
-  autocmd FileType json set softtabstop=2 tabstop=8 
-  autocmd FileType json set expandtab 
-  autocmd FileType json set foldmethod=syntax 
-augroup END 
+au! BufRead,BufNewFile *.json set filetype=json
+augroup json_autocmd
+  autocmd!
+  autocmd FileType json set autoindent
+  autocmd FileType json set formatoptions=tcq2l
+  autocmd FileType json set textwidth=78 shiftwidth=2
+  autocmd FileType json set softtabstop=2 tabstop=8
+  autocmd FileType json set expandtab
+augroup END
+
+au VimEnter * RainbowParenthesesToggle
+au Syntax * RainbowParenthesesLoadRound
+au Syntax * RainbowParenthesesLoadSquare
+au Syntax * RainbowParenthesesLoadBraces
 
 " Only do this part when compiled with support for autocommands.
 if has("autocmd")
@@ -223,7 +235,11 @@ if has("autocmd")
 
   autocmd FileType make     set noexpandtab
   autocmd FileType python   set noexpandtab
-  
+
+  " erlang for opscode
+  autocmd FileType erlang set expandtab
+  autocmd FileType erlang set softtabstop=4 tabstop=4 shiftwidth=4
+  autocmd FileType erlang set textwidth=92
 
   " For all text files set 'textwidth' to 78 characters.
   autocmd FileType text setlocal textwidth=78