Update git info in zsh prompt
Add ahead/behind and update git prompt
Merge branch 'master' of https://github.com/ngquerol/dotfiles

Conflicts:
	zsh/05-prompt.zsh