diff --git a/vim/.vimrc b/vim/.vimrc
index 627ad73..773dace 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -19,12 +19,12 @@ if has("autocmd")
   filetype plugin indent on
 endif
 
-set shell=sh
+set shell=fish
 set showcmd            " Show (partial) command in status line.
 set showmatch           " Show matching brackets.
 set hlsearch
-"set ignorecase         " Do case insensitive matching
-"set smartcase          " Do smart case matching
+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
@@ -267,6 +267,7 @@ else
 endif
 
 
+" Clap mappings
 nmap <C-p> :Clap files<CR>
 nmap <C-p>b :Clap buffers<CR>
 nmap <C-p>r :Clap grep<CR>