add csv.vim
Merge branch 'master' of github.com:zhangxiao/vimrc

Conflicts:
	.gitmodules
	vimrc