ignore the fact that the ~/.gitconfig file might be missing
Merge branch 'master' of github.com:brianphillips/dotfiles

Conflicts:
	Makefile
Merge branch 'master' of github.com:brianphillips/dotfiles
fix install-tig and install-z targets