diff --git a/tmux.conf b/tmux.conf
index 551b7e3..cb24d9c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -86,3 +86,5 @@ bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M"
 # with tmux 2.1. This is backwards-compatible with earlier versions of tmux,
 # AFAICT.
 set-option -g assume-paste-time 0
+# prevent escape delay for vim
+set -sg escape-time 0
diff --git a/vimrc.bundles b/vimrc.bundles
index 399b0ec..e8a9d48 100644
--- a/vimrc.bundles
+++ b/vimrc.bundles
@@ -1,5 +1,6 @@
 Plug 'airblade/vim-gitgutter'
 Plug 'ctrlpvim/ctrlp.vim'
+Plug 'fatih/vim-go'
 Plug 'flazz/vim-colorschemes'
 Plug 'majutsushi/tagbar'
 Plug 'nestorsalceda/vim-strip-trailing-whitespaces'