Adding a quick check to see if there is SCM in my current directory
Merge branch 'master' of https://github.com/daogilvie/dotfiles

Conflicts:
	zsh/prompt.zsh