updated git and zsh config
Merge branch 'master' of github.com:mbocd/dotfiles

* 'master' of github.com:mbocd/dotfiles:
  updated git and zsh config

Conflicts:
	zsh.config
merged zsh.config