Remove unused stuff
Merge branch 'master' of github.com:genehack/emacs