modifs mineures
Merge branch 'master' of git://github.com/HeroInNoMan/emacs-conf