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

Conflicts:
	home/.vim/vundles.vim