Need smex
Merge branch 'master' of http://github.com/calve/emacs.d