my theme
better coloring
ported my completion settings
better coloring for git
Merge branch 'master' of github.com:yattom/oh-my-zsh

Conflicts:
	themes/yattom.zsh-theme