diff --git a/rc/vimrc b/rc/vimrc
index dd4f9a0c..8f135fb1 100644
--- a/rc/vimrc
+++ b/rc/vimrc
@@ -4,32 +4,32 @@ set nocompatible
 " Show syntax colours
 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 incsearch	" Incremental search
-set autowrite	" Automatically save before commands like :next and :make
-set hidden		" Hide buffers when they are abandoned
-"set mouse=a	" Enable mouse usage (all modes)
+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 incsearch  " Incremental search
+set autowrite   " Automatically save before commands like :next and :make
+set hidden      " Hide buffers when they are abandoned
+"set mouse=a    " Enable mouse usage (all modes)
 
 " Source a global configuration file if available
 if filereadable("/etc/vim/vimrc.local")
-		source /etc/vim/vimrc.local
+        source /etc/vim/vimrc.local
 endif
 
-set number		" Show line numbers.
+set number      " Show line numbers.
 
-set ruler		" Show the line and column number of the cursor position,
-				" separated by a comma.
+set ruler       " Show the line and column number of the cursor position,
+                " separated by a comma.
 
 set background=dark
 
 "Use modelines!
 set modeline
-set tabstop=4	"four spaces is likely a tab
+set tabstop=4   "four spaces is likely a tab
 "set shiftwidth=4
-set noexpandtab
+set expandtab
 set autoindent
 
 " Longer history
@@ -48,7 +48,7 @@ set visualbell
 
 " gvim has light background
 if has('gui_running')
-	set background=light
+    set background=light
 endif
 
 " Show hidden characters via
@@ -71,24 +71,24 @@ filetype plugin indent on
 
 " Return to last edit position when opening files (You want this!)
 autocmd BufReadPost *
-	 \ if line("'\"") > 0 && line("'\"") <= line("$") |
-	 \	 exe "normal! g`\"" |
-	 \ endif
+     \ if line("'\"") > 0 && line("'\"") <= line("$") |
+     \   exe "normal! g`\"" |
+     \ endif
 
 " dos2unix ^M copied from http://stackoverflow.com/a/5361702/1675649
 fun! Dos2unixFunction()
-	let _s=@/
-	let l = line(".")
-	let c = col(".")
-	try
-		set ff=unix
-		w!
-		"%s/\%x0d$//e
-	catch /E32:/
-		echo "Sorry, the file is not saved."
-	endtry
-	let @/=_s
-	call cursor(l, c)
+    let _s=@/
+    let l = line(".")
+    let c = col(".")
+    try
+        set ff=unix
+        w!
+        "%s/\%x0d$//e
+    catch /E32:/
+        echo "Sorry, the file is not saved."
+    endtry
+    let @/=_s
+    call cursor(l, c)
 endfun
 com! Dos2Unix keepjumps call Dos2unixFunction()
 au BufReadPost * keepjumps call Dos2unixFunction()