diff --git a/.vimrc b/.vimrc
index b15afb9..b224073 100644
--- a/.vimrc
+++ b/.vimrc
@@ -409,8 +409,8 @@ else
 endif
 cnoremap sudow w !sudo tee % >/dev/null
 " Allow saving of files as sudo when I forgot to start vim using sudo.
-cmap w!! w !sudo tee > /dev/null %
-
+"cmap w!! w !sudo tee > /dev/null %
+cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
 """""""""""
 " NerdTree
 """""""""""
@@ -439,6 +439,10 @@ if filereadable(expand('~/.vimrc.local'))
         let g:local_plugins = 0
         let g:local_settings = 1
         source ~/.vimrc.local
+        " Look for .vimrc in working dir
+        " Restrict cmdline as this could be seen as security issue
+        set exrc
+        set secure
 endif
 
 """"""""""
@@ -475,6 +479,9 @@ set spelllang=fr,en
 " Ctrl-L correct last error
 inoremap <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u
 
+"set list
+"set listchars=eol:⏎,tab:▸·,trail:␠,nbsp:⎵
+
 """""""""
 " Plugin"
 """""""""
@@ -557,6 +564,12 @@ else
                 "let g:syntastic_cpp_compiler = 'clang++'
                 "let g:syntastic_cpp_compiler_options = '-std=c++14'
 endif
+
+"Android integration
+"Plugin 'hsanson/vim-android'
+"        let g:android_sdk_path="~/Android/Sdk/"
+"background task
+Plugin 'tpope/vim-dispatch'
 "Completion (need more configuration for python, c# ...)
 "Plugin 'Valloric/YouCompleteMe'
 " VimWiki