changes from Nomad
Merge branch 'master' of https://github.com/djeckhart/emacs.d
more changes from nomad