mac local
fix setup.sh
fix
:Merge branch 'master' of github.com:siriusjack/dotfiles

Conflicts:
	.vimrc