diff --git a/vimrc b/vimrc
index ba777177..cffb6883 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,6 @@
+" I probably don't need to have Vi compatibility.
+set nocompatible
+
 " Copied from /usr/local/vim/vimrc of Debian.
 " This should read Debian default config files too.
 runtime! debian.vim
@@ -11,10 +14,10 @@ syntax on
 set showcmd		" Show (partial) command in status line.
 set showmatch		" Show matching brackets.
 set ignorecase		" Do case insensitive matching
-"set smartcase		" Do smart case matching
+set smartcase		" Do smart case matching
 "set incsearch		" Incremental search
 set autowrite		" Automatically save before commands like :next and :make
-"set hidden             " Hide buffers when they are abandoned
+set hidden             " Hide buffers when they are abandoned
 set mouse=a		" Enable mouse usage (all modes)
 
 " Source a global configuration file if available
@@ -62,3 +65,25 @@ set expandtab
 set autoindent
 
 " end of copied fron linuxquestions.org
+
+" Copied from whttp://items.sjbach.com/319/configuring-vim-right
+
+" Set leader key as ,
+let mapleader = ","
+
+" Longer history
+set history=1000
+
+" Extended % matching
+runtime macros/matchit.vim
+
+" Make tab filler useful.
+set wildmenu
+set wildmode=list:longest
+
+" Set terminal title (This probably helps with tmux)
+set title
+
+" Flash, do not beep!
+set visualbell
+" End of copied from http://items.sjbach.com/319/configuring-vim-right