git: Use diff3 when showing conflicts
gpg: Encrypt messages to self when sending them out