updates to config
Merge branch 'master' of github.com:ncrohn/emacs