Improve imenu
Merge pull request #170 from defunkt/improve-imenu

Improve imenu