diff --git a/vim/.netrwhist b/vim/.netrwhist
new file mode 100644
index 0000000..a01096e
--- /dev/null
+++ b/vim/.netrwhist
@@ -0,0 +1,7 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =5
+let g:netrw_dirhist_1='/Users/codingfu/src/umbrella'
+let g:netrw_dirhist_2='/Users/codingfu/src/umbrella/apps'
+let g:netrw_dirhist_3='/Users/codingfu/src/umbrella/apps/client_api'
+let g:netrw_dirhist_4='/Users/codingfu/src/umbrella'
+let g:netrw_dirhist_5='/Users/codingfu/src/umbrella/script'
diff --git a/vim/bundle/bufexplorer b/vim/bundle/bufexplorer
new file mode 160000
index 0000000..b5fcd2b
--- /dev/null
+++ b/vim/bundle/bufexplorer
@@ -0,0 +1 @@
+Subproject commit b5fcd2b41a6f4de08d0a40bb6d9117cc256d29c6
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
new file mode 160000
index 0000000..f6d93b8
--- /dev/null
+++ b/vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit f6d93b8788b57990a2669b2408004c0086d6a878
diff --git a/vim/vimrc b/vim/vimrc
index 6771527..07f71c3 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,7 +4,6 @@ set nocompatible
 syntax enable
 set background=light
 let g:solarized_termcolors=16
-"let g:solarized_termtrans=1
 colorscheme solarized
 
 set tabstop=2
@@ -27,8 +26,6 @@ set smartcase
 set incsearch
 set hlsearch
 
-set clipboard=unnamed "yank to clipboard
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " FORGET ABOUT ARROW KEYS 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -47,3 +44,8 @@ let g:Powerline_symbols = 'fancy'
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 autocmd InsertEnter * :set number
 autocmd InsertLeave * :set relativenumber
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Mappings
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+inoremap <c-s> <Esc>:w<CR>