Multiple vim updates, work related and whatnot

git-svn-id: http://photonzero.com/dotfiles/trunk@23 23f722f6-122a-0410-8cef-c75bd312dd78

.vimrc

@@ -4,6 +4,9 @@ syntax on
 colorscheme barak
 "set gfn=Monaco:h12:a
 set ts=4
+set softtabstop=4
+set shiftwidth=4
+set expandtab
 set nocompatible
 set smartcase
 set smartindent
@@ -20,8 +23,9 @@ au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
 autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
 autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 autocmd FileType python set omnifunc=pythoncomplete#Complete
-autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
+"autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
 let python_highlight_all = 1
+au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 set t_Co=16
 set t_Sf=ESC[3%dm
@@ -53,6 +57,20 @@ vnoremap <C-e> $
 inoremap <C-a> <C-O>^
 inoremap <C-e> <C-O>$
 
+" , #perl # comments
+map ,# :s/^/#/<CR>
+" , #mako ## comments
+map ,% :s/^/##/<CR>
+
+" ,/ C/C++/C#/Java // comments
+map ,/ :s/^/\/\//<CR>
+
+" ,< HTML comment
+map ,< :s/^\(.*\)$/<!-- \1 -->/<CR><Esc>:nohlsearch<CR>
+
+" c++ java style comments
+map ,* :s/^\(.*\)$/\/\* \1 \*\//<CR><Esc>:nohlsearch<CR>
+
 
 if !exists(":W")
 	command W :w