EMACS: Fixed master branch so it is how I want it