cleaning up and stuff
Merge branch 'master' of github.com:iwfmp/emacs