update vimrc
update vimrc
update vimrc
Update .vimrc for fugitive and Gitv
update dotfiles
Merge branch 'master' of github.com:thrbrd/dotfiles

Conflicts:
	.tmux.conf
	.vimrc
	.zshrc