diff --git a/vim/ftplugin/go.vim b/vim/ftplugin/go.vim
new file mode 100644
index 0000000000..e3de397a41
--- /dev/null
+++ b/vim/ftplugin/go.vim
@@ -0,0 +1,6 @@
+let g:go_fmt_command = "goimports"
+
+setlocal softtabstop=2
+setlocal listchars=tab:\ \ ,trail:·,nbsp:·
+
+compiler go
diff --git a/vimrc.bundles b/vimrc.bundles
index 3663ab7fa8..76c7ca224f 100644
--- a/vimrc.bundles
+++ b/vimrc.bundles
@@ -28,8 +28,9 @@ call plug#begin('~/.vim/bundle')
 
 " Define bundles via Github repos
 Plug 'christoomey/vim-run-interactive'
-Plug 'kchmck/vim-coffee-script'
 Plug 'ctrlpvim/ctrlp.vim'
+Plug 'fatih/vim-go'
+Plug 'kchmck/vim-coffee-script'
 Plug 'pbrisbin/vim-mkdir'
 Plug 'scrooloose/syntastic'
 Plug 'slim-template/vim-slim'