ZSH: Remove the double definition of JAVA_HOME
Maven: Update password and use tokens
Git: Remove shortcut for gitx
Git: Remove configuration for diffmerge
GPG: Set pinentry default location
tmux: Make pane-switching commands compatible with nano
Merge branch 'master' into oucs