Adding some stuff
Merge branch 'master' of https://github.com/pierrel/emacs