trying to fix config on new machine
Merge branch 'master' of github.com:ryane/.emacs.d