Added emacs configuration
merged