diff --git a/.vimrc b/.vimrc
index 7f53f29..68f07b8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -113,7 +113,10 @@ Bundle 'vim-scripts/mru.vim'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'scrooloose/nerdtree'
 Bundle 'vim-scripts/rubycomplete.vim'
+
 Bundle 'ervandew/supertab'
+let g:SuperTabDefaultCompletionType = "context"
+
 Bundle 'tpope/vim-rails'
 Bundle 'tpope/vim-fugitive'
 Bundle 'vim-ruby/vim-ruby'
@@ -236,6 +239,8 @@ command Q q
 command Qa qa
 command QA qa
 
+autocmd FileType go autocmd BufWritePre <buffer> Fmt
+
 "match NearColLimit /\%<121v.\%>117v/
 "match OverColLimit /.\%>120v/
 "match ExtraWhitespace /\s\+\%#\@<!$/