diff --git a/vim/README.md b/vim/README.md
index e53e967..c1a99f1 100644
--- a/vim/README.md
+++ b/vim/README.md
@@ -1,30 +1,17 @@
 #Vim Configuration Files
 
-My vim configuration is relatively straight forward.
+My vim configuration is relatively straight forward. I comment most lines.
 
-##Config File
-* Word-wrap is set to 80 characters
-* Mappings to quickly edit dotfiles
-* Relative numbering, with mapping to quickly swap
-
-##Bundles File
+### Bundles File
 The vimrc.bundles file stores the plugin information for
 [Vim-Plug](https://github.com/junegunn/vim-plug). Included in the file is a
 command to check for and pull-down the vim-plug files, if not previously
 installed. All configurations related to plugins goes into this file also, so if
 I want a plugin-free install, I can ignore this file and still run fine.
 
-####Notable Plugins
+## Notable Plugins
 * [Fugitive](https://github.com/tpope/vim-fugitive) for nice Git integration.
-* [Airline](https://github.com/bling/vim-airline) to look nice, but not garish.
-* [Vinegar](https://github.com/tpope/vim-vinegar) for a file browsing.
-* [Templates](https://github.com/ap/vim-templates.git) for easy templates.
+* [Vinegar](https://github.com/tpope/vim-vinegar) for file browsing.
 * [vimwiki](https://github.com/vimwiki/vimwiki) for info, diary and notes.
 * [Startify](https://github.com/mhinz/vim-startify) for a nice start-page
 * [Syntastic](https://github.com/scrooloose/syntastic) for syntax checking.
-
-##To-Do
-* [ ] Customize Airline more (Optional)
-* [ ] Consider adding [gist-vim](https://github.com/mattn/gist-vim) due to
-  prevalence of Gist at work
-* [ ] Get color situtated.
diff --git a/vim/vimrc b/vim/vimrc
index 9953227..ed39a62 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -48,6 +48,26 @@ augroup END
 " let g:netrw_browse_split=4
 " let g:netrw_winsize=25
 
+
+" ==============================================================================
+" Status Line
+" ==============================================================================
+hi StatusLineError ctermfg=15 ctermbg=1 guifg=red
+set laststatus=2
+set statusline=
+set statusline+=%m
+set statusline+=%r
+set statusline+=%h
+set statusline+=%{fugitive#statusline()}
+set statusline+=%#Pmenu#
+set statusline+=\ %F
+set statusline+=%=
+set statusline+=
+set statusline+=%#StatusLine#
+set statusline+=\|%l\:%c\|
+set statusline+=%#SyntasticError#
+set statusline+=%{SyntasticStatuslineFlag()}
+
 " ==============================================================================
 " Mappings
 " ==============================================================================
@@ -80,9 +100,6 @@ inoremap jk <esc>
 " Remove Trailing Whitespaace
 nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
 
-" Easy mapping for Startify
-nnoremap <silent> <leader>s :Startify<CR>
-
 " Open help topics in a full new tab
 command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args>
 
diff --git a/vim/vimrc-plugins b/vim/vimrc-plugins
index 6eea5a1..9e98c84 100644
--- a/vim/vimrc-plugins
+++ b/vim/vimrc-plugins
@@ -19,18 +19,17 @@ call plug#begin('~/.vim/bundle')
   Plug 'tpope/vim-unimpaired'
   Plug 'tpope/vim-commentary'
   Plug 'ajh17/VimCompletesMe'
+  Plug 'ludovicchabant/vim-gutentags'
   " Ruby Related
   Plug 'tpope/vim-endwise'
   Plug 'vim-ruby/vim-ruby'
   " Appearance Related
   Plug 'mhinz/vim-startify'
-  Plug 'bling/vim-airline'
   Plug 'dikiaap/minimalist'
   Plug 'junegunn/goyo.vim'
   " Syntax Related
   Plug 'scrooloose/syntastic'
   Plug 'tmux-plugins/vim-tmux'
-  Plug 'rondale-sc/vim-spacejam'
 call plug#end()
 
 " ==============================================================================
@@ -41,10 +40,6 @@ call plug#end()
 set t_Co=256
 colorscheme minimalist
 
-" Airline configuration
-set laststatus=2
-let g:airline_powerline_fonts = 1
-
 " Startify configs
 let g:startify_files_number = 6
 let g:startify_change_to_dir = 1
@@ -56,6 +51,9 @@ let g:startify_bookmarks = [
           \ ]
 
 " Syntastic configs
+" Easy mapping for Startify
+nnoremap <silent> <leader>s :Startify<CR>
+
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1