added red coloring to prompt when root.
added git status to prompt.
Merge branch 'master' of github.com:gregsheremeta/dotfiles

Conflicts:
	.zshrc