Cleaned up emacs files
Merge branch 'master' of https://github.com/haikubica/dotfiles