2nd try fix for `ido-merge-work-directories`

- items are cons cells of (basename . dirname)
- match should be performed against basename
- caching is skipped for the merge case
- flx highlighting is disabled for merged case

#10