machine-specific configs
Merge branch 'master' of github.com:michelk/emacs.d