Add global .gitignore file
Merge branch 'master' of https://github.com/fjammes/dot-config

Conflicts:
	.gitconfig