Changes diff tool
Merge branch 'master' of github.com:hauspie/dotfiles

Conflicts:
	_gitconfig