config updates
Merge branch 'master' of github.com:ryane/.emacs.d