Create .gitconfig using git config cmd

Creation of .gitignore_global file
Merge branch 'master' of github.com:fjammes/dot-config

Conflicts:
	.gitconfig
	setup.sh