clean up emacs config
Merge branch 'master' of github.com:catern/dotfiles