various updates
Merge branch 'master' of github.com:unpluggd/emacs-setup