Add emacs config
Merge branch 'master' into zaalbar
Tweak git aliases
Clean up
Remove obsolete java variables
Do not set PATH in zshenv
Merge branch 'master' into zaalbar