diff --git a/.vimrc b/.vimrc
index 9ae17f0d..8dd7efee 100644
--- a/.vimrc
+++ b/.vimrc
@@ -37,8 +37,11 @@ set cuc
 set shortmess=atI   " 启动的时候不显示那个援助乌干达儿童的提示  
 set go=             " 不要图形按钮  
 "color desert     " 设置背景主题  
-color ron     " 设置背景主题  
+"color ron     " 设置背景主题  
 "color torte     " 设置背景主题  
+set background=dark
+set t_Co=256
+colorscheme molokai
 "set guifont=Courier_New:h10:cANSI   " 设置字体  
 "autocmd InsertLeave * se nocul  " 用浅色高亮当前行  
 autocmd InsertEnter * se cul    " 用浅色高亮当前行  
@@ -72,6 +75,9 @@ set smarttab
 set number
 " 历史记录数
 set history=1000
+" 相对行号
+set relativenumber number
+
 "搜索逐字符高亮
 set hlsearch
 set incsearch
@@ -133,8 +139,8 @@ func SetTitle()
 	else 
 		call setline(1, "/*************************************************************************") 
 		call append(line("."), "	> File Name: ".expand("%")) 
-		call append(line(".")+1, "	> Author: ") 
-		call append(line(".")+2, "	> Mail: ") 
+		call append(line(".")+1, "	> Author: myandrew ") 
+		call append(line(".")+2, "	> Mail: wanglinli218@gmail.com ") 
 		call append(line(".")+3, "	> Created Time: ".strftime("%c")) 
 		call append(line(".")+4, " ************************************************************************/") 
 		call append(line(".")+5, "")
@@ -175,7 +181,6 @@ imap <C-v> <Esc>"*pa
 imap <C-a> <Esc>^
 imap <C-e> <Esc>$
 vmap <C-c> "+y
-set mouse=v
 "set clipboard=unnamed
 "去空行  
 nnoremap <F2> :g/^\s*$/d<CR> 
@@ -315,7 +320,7 @@ set backspace=2
 " 允许backspace和光标键跨越行边界
 set whichwrap+=<,>,h,l
 " 可以在buffer的任何地方使用鼠标（类似office中在工作区双击鼠标定位）
-set mouse=a
+set mouse=v
 set selection=exclusive
 set selectmode=mouse,key
 " 通过使用: commands命令，告诉我们文件的哪一行被改变过
@@ -464,8 +469,14 @@ Bundle 'The-NERD-Commenter'
 Bundle 'django_templates.vim'
 Bundle 'Django-Projects'
 
+
 "Bundle 'FredKSchott/CoVim'
 "Bundle 'djangojump'
+"golang
+Bundle 'cespare/vim-golang'
+Bundle 'fatih/vim-go'
+Bundle 'dgryski/vim-godef'
+Bundle 'undx/vim-gocode'
 " ...
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:html_indent_script1 = "inc"
@@ -491,5 +502,17 @@ set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe,*.pyc,*.png,*.jpg,*.gif  " Windows
 let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
 let g:ctrlp_custom_ignore = '\v\.(exe|so|dll)$'
 let g:ctrlp_extensions = ['funky']
+let g:gofmt_command = 'goimports'
+
+autocmd BufWritePre *.go :Fmt
 
 let NERDTreeIgnore=['\.pyc']
+
+highlight clear SpellBad
+highlight SpellBad term=standout ctermfg=1 term=underline cterm=underline
+highlight clear SpellCap
+highlight SpellBad term=underline cterm=underline
+highlight clear SpellRare
+highlight SpellBad term=underline cterm=underline
+highlight clear SpellLocal
+highlight SpellBad  term=underline cterm=underline
diff --git a/setup.sh b/setup.sh
index d81de307..b563cc7d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -17,15 +17,15 @@ fi
 sudo easy_install -ZU autopep8 twisted
 sudo ln -s /usr/bin/ctags /usr/local/bin/ctags
 mv -f ~/vim ~/vim_old
-cd ~/ && git clone https://github.com/ma6174/vim.git
+cd ~/ && git clone https://github.com/myandrew/vim.git
 mv -f ~/.vim ~/.vim_old
 mv -f ~/vim ~/.vim
 mv -f ~/.vimrc ~/.vimrc_old
 mv -f ~/.vim/.vimrc ~/
 git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
-echo "ma6174正在努力为您安装bundle程序" > ma6174
-echo "安装完毕将自动退出" >> ma6174
-echo "请耐心等待" >> ma6174
+echo "ma6174(author)正在努力为您安装bundle程序" > ma6174(author)
+echo "安装完毕将自动退出" >> ma6174(author)
+echo "请耐心等待" >> ma6174(author)
 vim ma6174 -c "BundleInstall" -c "q" -c "q"
 rm ma6174
 echo "安装完成"
diff --git a/uninstall.sh b/uninstall.sh
old mode 100644
new mode 100755