diff --git a/vimrc b/vimrc
index c79021f..87ba108 100644
--- a/vimrc
+++ b/vimrc
@@ -235,6 +235,10 @@ augroup sourcing
   autocmd bufwritepost .vimrc source $MYVIMRC
 augroup END
 
+noremap <silent> <C-S> :update<CR>
+vnoremap <silent> <C-S> <C-C>:update<CR>
+inoremap <silent> <C-S> <C-O>:update<CR>
+
 " Open file prompt with current path
 nmap <leader>e :e <C-R>=expand("%:p:h") . '/'<CR>
 
diff --git a/zshrc b/zshrc
index 22daf28..90be577 100644
--- a/zshrc
+++ b/zshrc
@@ -28,6 +28,7 @@ export NODE_PATH=/usr/local/lib/node_modules
 export TERM=rxvt
 export LC_ALL=$LANG
 alias ..="cd .."
+alias vi="stty stop '' -ixoff ; vim"
 alias gcc="gcc-5"
 alias g++="g++-5"
 alias push="git push"