Make `notmuch-address-expand-name' work with ido

Since I'm now using ido instead of helm.
Finally remove all the all commented-out stuff