--- a/.vimrc
+++ b/.vimrc
@@ -155,10 +155,6 @@ nmap <C-j> <C-w>j
 nmap <C-k> <C-w>k
 nmap <C-l> <C-w>l
 
-" Prefer using regexes like in perl code.
-map / /\v
-map ? ?\v
-
 " navigate by on-screen lines
 map j gj
 map k gk
@@ -198,6 +194,7 @@ filetype plugin indent on
 
 set encoding=utf-8
 
+set incsearch
 set hlsearch
 set ignorecase
 set smartcase
@@ -234,6 +231,9 @@ set ruler
 set showcmd
 set wildmenu
 
+set ttimeout
+set ttimeoutlen=200
+
 set tags+=.tags
 
 " Ignore compiled files and repositories
@@ -320,7 +320,7 @@ endif
 
 " Autocmds  {{{
 function! AutoSessionConfig()
-  if strlen(v:servername) > 0
+  if strlen(v:servername) > 0 && match(v:servername, '^VIM') == -1
     let g:unite_source_session_default_session_name = tolower(v:servername)
     let g:unite_source_session_enable_auto_save = 1