add p4merge as mergetool
Merge branch 'master' of github.com:wkirschbaum/dotfiles

Conflicts:
	.gitconfig