.emacs & .Xdefaults update
Merge branch 'master' of https://github.com/Mandibull/dotfiles