added csv.vim and plantuml
Merge branch 'master' of https://github.com/mheider/dotfiles

Conflicts:
	.gitmodules