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

Conflicts:
	homebrew/setup.sh
	vim/setup.sh
	zsh/setup.sh