srcexpl.vim,trinity.vim,NERD_tree.vim,taglist.vim
Merge branch 'master' of github.com:twhs/dotfiles

Conflicts:
	.vimrc
	.zshrc