Maven: Update password and use tokens
Git: Remove shortcut for gitx
Git: Remove configuration for diffmerge
GPG: Set pinentry default location
Merge branch 'master' into makkhbox

Conflicts:
	gitconfig
	gnupg/gpg-agent.conf