untabify and some hooks refactoring
Merge branch 'master' of https://github.com/w-vi/emacs