Updating emacs config.
Merge branch 'master' of github.com:bgarber/configs