tune .gitconfig
Merge branch 'dev-3.0-maps' of github.com:warlockcc/wbar into dev-3.0-maps

Conflicts:
	.gitignore