Changing emacs all around
Merge pull request #2 from xcthulhu/master

Changing emacs all around