no need for whoami - used proper zsh escape sequences
Merge branch 'master' of https://github.com/deegs/dotfiles
Fix git status so we know we are in a git repository in subdirectories as well, not just when in the top level of the repo.

Conflicts:
	zsh/prompt.zsh