misc changes
Merge branch 'master' of github.com:bradylove/.emacs.d.redo