update mac
Merge branch 'master' of github.com:kozyty/dotfiles

Conflicts:
	.gitconfig
	.vim/.netrwhist
	.zshrc