added vim-fugitive
Merge branch 'master' of github.com:jobwat/dotfiles

Conflicts:
	.gitmodules
updating oh-my-zsh