diff --git a/vim/.vim/plugin/mappings.vim b/vim/.vim/plugin/mappings.vim
index 77ea8d4..256b2db 100644
--- a/vim/.vim/plugin/mappings.vim
+++ b/vim/.vim/plugin/mappings.vim
@@ -1,10 +1,10 @@
 " Mappings
 let mapleader=","
 let g:mapleader=","
+
 map <leader>rl :source $MYVIMRC<CR>
 map <leader>ss :setlocal spell!<CR>
-map <leader>ct :TlistToggle<CR>     " taglist shortcut
-map <leader>ts :%s/\s\s*$//g<CR>    " trim trailing whitespace
+map <leader>ts :%s/\s\s*$//g<CR>
 nnoremap <leader>rc :split $MYVIMRC<cr>
 nnoremap <leader>p :set paste<cr>
 nnoremap <leader>np :set nopaste<cr>
diff --git a/vim/.vim/plugin/settings.vim b/vim/.vim/plugin/settings.vim
index d3f33f6..912ae21 100644
--- a/vim/.vim/plugin/settings.vim
+++ b/vim/.vim/plugin/settings.vim
@@ -1,82 +1,79 @@
-" Basics
-set t_Co=256        " Use 256 colors
-set encoding=utf8   " Use utf-8 encoding
-set nocompatible    " Get out of vi-compatible mode
-set background=dark " I am using a dark background
-" set background=light " I am using a dark background
-syntax on           " Syntax highlighting on
+syntax on
+filetype plugin on
+filetype indent on
 
-" General
+"colorscheme PaperColor
 "colorscheme solarized
 colorscheme wombat
-"colorscheme PaperColor
+
+" Basics
+set t_Co=256
+set encoding=utf8
+set nocompatible
+set background=dark
+" set background=light
+
+" General
 " setlocal spell spelllang=en_us
-set fileformats=unix,dos,mac    " support all three, in this order
-set nostartofline               " leave my cursor where it was
+set fileformats=unix,dos,mac
+set nostartofline
 set history=10000
-set autoread        " Set to auto read when a file is changed from the outside
-set autochdir       " Change current directory to be directory of current file
+set autoread
+set autochdir
 set colorcolumn=81
-"set foldmethod=syntax
 
 " Have tab complete work more like bash
 set wildmenu
 set wildmode=list:longest
 set backspace=start,eol,indent
 set whichwrap+=<,>,[,]
-set magic       "Set magic on, for regular expressions
+set magic
 
 " Turn on omni completion. Must have `filetype plugin on` to use.
 " To use, in insert mode press ctrl+x ctrl+o
 set omnifunc=syntaxcomplete#Complete
+set completeopt=menu,longest,preview
 
 " Tabs
-set expandtab       " expandtab converts tabs to spaces. For tabs, set noexpandtab
-set shiftwidth=4    " unify
-set softtabstop=4   " Pressing backspace works like tabs
-set tabstop=4       " real tabs should be 4, but they will show with set list on
+set expandtab
+set shiftwidth=4
+set softtabstop=4
+set tabstop=4
 
 " Indent
-set autoindent      "Auto indent
-set smartindent     "Smart indent
-set copyindent      " above all -- follow the conventions laid before us
-set preserveindent  " above all -- follow the conventions laid before us
-set shiftround      " when at 3 spaces, and I hit '>', go to 4, not 5
-filetype plugin on   " load filetype plug-ins and indent settings
-filetype indent on   " load filetype plug-ins and indent settings
+set autoindent
+set smartindent
+set copyindent
+set preserveindent
+set shiftround
+
+" Status
+" ~/file [type] [line,column] [number of lines]
+set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
+set laststatus=2
+
+" Text Formatting/Layout
+set nowrap
+set ignorecase
+set smartcase
+set list
+set listchars=tab:\ \ ,trail:…
 
 " UI
-set showcmd         " show the command being typed
-set ruler           " Always show current positions along the bottom
-set number relativenumber  " Use relative line numbers
-set numberwidth=4   " If we have over 9999 lines
-set hidden          " you can change buffer without saving
-"set mouse=a         " use mouse everywhere
+set showcmd
+set ruler
+set number relativenumber
+set numberwidth=4
+set hidden
 
-" No sound on errors
+" Cues
+set showmatch
+set matchtime=2
+set hlsearch
+set incsearch
+set scrolloff=5
+set sidescrolloff=5
 set noerrorbells
 set novisualbell
-"visual bell
 set t_vb=
 set tm=500
-
-" Visual Cues
-set showmatch       " show matching brackets
-set matchtime=2     " how many tenths of a second to blink matching brackets for
-set hlsearch        " highlight searched for phrases
-set incsearch       " BUT do highlight as you type you search phrase
-set scrolloff=5     " Keep 5 lines (top/bottom) for scope
-set sidescrolloff=5 " Keep 5 lines at the size
-set list        " we do what to show tabs, to ensure we get them out of my files
-set listchars=tab:\ \ ,trail:… " show tabs and trailing whitespace
-
-" Status
-" ~\file[+] [type] [line,column] [number of lines]
-set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
-set laststatus=2 " always show the status line
-
-" Text Formatting/Layout
-set nowrap      " do not wrap line
-set ignorecase  " case insensitive by default
-set smartcase   " if there are caps, go case-sensitive
-set completeopt=menu,longest,preview " improve the way autocomplete works