Fix vim submodule
Fixes
Fix OS X installation..hopefully.
Merge branch 'master' of github.com:gb610/dotfiles

Conflicts:
	homebrew/setup.sh
	vim/setup.sh
	zsh/setup.sh
Merge branch 'master' into debian

Conflicts:
	.gitmodules
	cask/setup.sh
	homebrew/setup.sh
	install.sh
	iterm2/setup.sh
	osx/setup.sh
	tex/setup.sh
	zsh/setup.sh