Merge dot.emacs
Merge dot.emacs