diff --git a/.gitmodules b/.gitmodules
index 942fa08..b8a2188 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,18 @@
 [submodule "vim/bundle/vim-airline-themes"]
 	path = vim/bundle/vim-airline-themes
 	url = https://github.com/vim-airline/vim-airline-themes
+[submodule "vim/bundle/vim-snippets"]
+	path = vim/bundle/vim-snippets
+	url = https://github.com/honza/vim-snippets.git
+[submodule "vim/bundle/tlib_vim"]
+	path = vim/bundle/tlib_vim
+	url = https://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/vim-addon-mw-utils"]
+	path = vim/bundle/vim-addon-mw-utils
+	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/vim-snipmate"]
+	path = vim/bundle/vim-snipmate
+	url = https://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/tabular"]
+	path = vim/bundle/tabular
+	url = https://github.com/godlygeek/tabular.git
diff --git a/vim/bundle/tabular b/vim/bundle/tabular
new file mode 160000
index 0000000..00e1e7f
--- /dev/null
+++ b/vim/bundle/tabular
@@ -0,0 +1 @@
+Subproject commit 00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367
diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim
new file mode 160000
index 0000000..34b1329
--- /dev/null
+++ b/vim/bundle/tlib_vim
@@ -0,0 +1 @@
+Subproject commit 34b13299b5da7ad66ea387027d458bd54127687c
diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils
new file mode 160000
index 0000000..0c5612f
--- /dev/null
+++ b/vim/bundle/vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
diff --git a/vim/bundle/vim-snipmate b/vim/bundle/vim-snipmate
new file mode 160000
index 0000000..0c20e41
--- /dev/null
+++ b/vim/bundle/vim-snipmate
@@ -0,0 +1 @@
+Subproject commit 0c20e4136a298a73e21047d12cc5049595fb8445
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
new file mode 160000
index 0000000..5225b54
--- /dev/null
+++ b/vim/bundle/vim-snippets
@@ -0,0 +1 @@
+Subproject commit 5225b549487bf97eb5aa6c5cae91379a1ad9b7ba
diff --git a/vim/rcfiles/vimrc b/vim/rcfiles/vimrc
index 1e8655c..4eec6ed 100644
--- a/vim/rcfiles/vimrc
+++ b/vim/rcfiles/vimrc
@@ -18,8 +18,8 @@ set nowritebackup
 
 set title
 set number
-set showcmd "show combo command as you type it in the bottom right corner
-set showmode "show what mode you're in (Insert, Replace, Visual, etc.)
+"set showcmd "show combo command as you type it in the bottom right corner
+set noshowmode "don't show what mode
 set ruler laststatus=2 "show rulers for buffers and the status line even if there's only 1 file
 set clipboard+=unnamed "the same clipboard is used for Visual mode
 set ignorecase smartcase "when searching, match case only when at least one char is upper
@@ -37,7 +37,7 @@ set bs=2
 
 nmap <tab> w
 nmap 
 :wq!
-imap  <BS>
+nmap  <BS>
 
 map <leader>b  <Esc>:set cc=79<CR>
 map <leader>nb <Esc>:set cc=0<CR>
@@ -54,12 +54,17 @@ nnoremap n nzzzv
 nnoremap N Nzzzv¬
 
 au BufRead,BufNewFile *.pp
-	\ set filetype=puppet
-au BufRead,BufNewFile *_spec.rb
-	\ nmap <F8> :!rspec --color %<CR>
+  \ set filetype=puppet
 filetype plugin indent on
 
-
-"====[ Make tabs, trailing whitespace, and non-breaking spaces visible ]======
 exec "set listchars=tab:\uBB\uBB,trail:\uB7,nbsp:~"
 set list
+
+
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+let g:airline_theme='powerlineish'
+let g:airline#extensions#tabline#left_sep = ''
+let g:airline#extensions#tabline#left_alt_sep = ''
+let g:airline#extensions#tabline#right_sep = ''
+let g:airline#extensions#tabline#right_alt_sep = ''