extempore.el: improved imenu support
Merge remote-tracking branch 'upstream/master'