cleanup func and hooks
Merge branch 'master' of https://github.com/paulbdavis/emacs