diff --git a/pack/local/start/nerdcommenter b/pack/local/start/nerdcommenter
index a65465d..e361a44 160000
--- a/pack/local/start/nerdcommenter
+++ b/pack/local/start/nerdcommenter
@@ -1 +1 @@
-Subproject commit a65465d321f2f8a74b2ffa540b9b87563f7e12e8
+Subproject commit e361a44230860d616f799a337bc58f5218ab6e9c
diff --git a/pack/local/start/nerdtree b/pack/local/start/nerdtree
index 9310f91..bc606c4 160000
--- a/pack/local/start/nerdtree
+++ b/pack/local/start/nerdtree
@@ -1 +1 @@
-Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26
+Subproject commit bc606c43e2d8ef0987d6d3d1ec8c17360a2e29d5
diff --git a/pack/local/start/nginx.vim b/pack/local/start/nginx.vim
index ceeab16..cffaec5 160000
--- a/pack/local/start/nginx.vim
+++ b/pack/local/start/nginx.vim
@@ -1 +1 @@
-Subproject commit ceeab164880ad90e73ab1be31dc3932777b9ef20
+Subproject commit cffaec54f0c7f9518de053634413a20e90eac825
diff --git a/pack/local/start/tlib_vim b/pack/local/start/tlib_vim
index 70c4e22..d3bdad7 160000
--- a/pack/local/start/tlib_vim
+++ b/pack/local/start/tlib_vim
@@ -1 +1 @@
-Subproject commit 70c4e222464020edc2809c932b488daaf891eeef
+Subproject commit d3bdad7b5e4253dc7ce6793342d7b8755c67ff0c
diff --git a/pack/local/start/vim-airline b/pack/local/start/vim-airline
index 26f9227..ff7352e 160000
--- a/pack/local/start/vim-airline
+++ b/pack/local/start/vim-airline
@@ -1 +1 @@
-Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc
+Subproject commit ff7352e4bff02eb600a136b6fd741404f3195371
diff --git a/pack/local/start/vim-fugitive b/pack/local/start/vim-fugitive
index a678543..854a8df 160000
--- a/pack/local/start/vim-fugitive
+++ b/pack/local/start/vim-fugitive
@@ -1 +1 @@
-Subproject commit a67854368ea9810936d57e3fea00a4c05bf47c26
+Subproject commit 854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b
diff --git a/pack/local/start/vim-gitgutter b/pack/local/start/vim-gitgutter
index 256702d..67ef116 160000
--- a/pack/local/start/vim-gitgutter
+++ b/pack/local/start/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 256702dd1432894b3607d3de6cd660863b331818
+Subproject commit 67ef116100b40f9ca128196504a2e0bc0a2753b0
diff --git a/pack/local/start/vim-surround b/pack/local/start/vim-surround
index f51a26d..3d188ed 160000
--- a/pack/local/start/vim-surround
+++ b/pack/local/start/vim-surround
@@ -1 +1 @@
-Subproject commit f51a26d3710629d031806305b6c8727189cd1935
+Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9
diff --git a/pack/local/start/vim-template b/pack/local/start/vim-template
index 233b201..0bf6072 160000
--- a/pack/local/start/vim-template
+++ b/pack/local/start/vim-template
@@ -1 +1 @@
-Subproject commit 233b201a308335600614a5c1a3034636a620d05b
+Subproject commit 0bf607233719a0ed6e14bf0197ba8950bf8833fc
diff --git a/pack/local/start/vim-terraform b/pack/local/start/vim-terraform
index f0b17ac..3d1cfc8 160000
--- a/pack/local/start/vim-terraform
+++ b/pack/local/start/vim-terraform
@@ -1 +1 @@
-Subproject commit f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443
+Subproject commit 3d1cfc8e183f1a58f71587442849510462f5857b
diff --git a/pack/local/start/vim-workspace b/pack/local/start/vim-workspace
index 5c0025f..c0d1e43 160000
--- a/pack/local/start/vim-workspace
+++ b/pack/local/start/vim-workspace
@@ -1 +1 @@
-Subproject commit 5c0025feecc24052ce8bf5aa0d16a10df2db1ea5
+Subproject commit c0d1e4332a378f58bfdf363b4957168fa78e79b4
diff --git a/vimrc b/vimrc
index 9e11555..01c13c0 100644
--- a/vimrc
+++ b/vimrc
@@ -14,6 +14,7 @@ set history=50
 set nohlsearch
 set nostartofline
 set autochdir
+set paste
 
 set nofoldenable
 " set background=dark
@@ -120,12 +121,12 @@ nnoremap <silent> <Leader>tt :below terminal<CR>
 " GIT
 """""""""""""""
 nnoremap <silent> <Leader>gh :GitGutterLineHighlightsToggle<CR>
-nnoremap <silent> <Leader>gc :Gcommit -a<CR>
-nnoremap <silent> <Leader>gs :Gstatus<CR>
+nnoremap <silent> <Leader>gc :Git commit -a<CR>
+nnoremap <silent> <Leader>gs :Git<CR>
 nnoremap <silent> <Leader>ga :Git add -p<CR>
-nnoremap <silent> <Leader>gm :Gcommit --amend<CR>
-nnoremap <silent> <Leader>gp :Gpull<CR>
-nnoremap <silent> <Leader>gP :Gpush<CR>
+nnoremap <silent> <Leader>gm :Git commit --amend<CR>
+nnoremap <silent> <Leader>gp :Git pull<CR>
+nnoremap <silent> <Leader>gP :Git push<CR>
 
 """"""""""""""""""
 " Airline customizations
@@ -199,12 +200,6 @@ nnoremap <silent> <S-Up> V
 vnoremap <silent> <S-Down> j
 vnoremap <silent> <S-Up> k
 
-" Terminal/Filemanager
-" nnoremap <silent> <F9> :OpenTerminal<CR>
-" nnoremap <silent> <F10> :OpenFilemanager<CR><CR>
-nnoremap <silent> <Leader>of :OpenFilemanager<CR>
-
-
 " Map Ctrl-T to new tab and Ctrl-W to close tab
 " Map Ctrl-S to save
 if !(has('mac') || has('macunix'))