Track .gitconfig
Track gitconfig
Merge branch 'common'

Conflicts:
	.gitconfig
Add color support to git
Merge branch 'common'

Conflicts:
	.gitconfig
Export EDITOR envvar
Fix some spacing
Merge branch 'common'

Conflicts:
	.zshrc
Explain some more details in zshrc
Merge branch 'master' of github.com:eddiejessup/Dotfiles