Mess around with emacs config
Merge branch 'master' into zaalbar