Updated for helm, emacs 24.4