...
Merge branch 'master' of https://github.com/benekastah/osx-bootstrap

Conflicts:
	home/.gitconfig
	home/.vim/au.vim
	home/.zshrc