gitconfig repos and color
Merge branch 'master' of github.com:mjibson/dotfiles

Conflicts:
	gitconfig