modified:   .emacs
Merge branch 'master' of https://github.com/Dhole/dot_files