Merging pull request from efritzley with my changes
Merging pull request from efritzley with my changes

Thanks for the contribution! Your solution looks much nicer than what
I had finagled.

Wintaru/Vimdentation