Some more tweaks
Merge branch 'master' of github.com:francispotter/emacs-setup