some emacs changes
Merge branch 'master' of github.com:twblalock/dotfiles