Disable smex
Merge branch 'master' of https://github.com/thbkrshw/emacs24

Conflicts:
	hl-misc.el