Reorganized emacs config.
Merge branch 'master' of github.com:jdahm/dotfiles
Updates.