Import changes from other repos

[k-takata]

It seems that @benjifisher's repository is abandoned. (benjifisher/matchit.zip#10) So I create a PR here.

Benji's repository has some additional commits:

• https://github.com/benjifisher/matchit.zip/commit/46210a8fc64f041c61d46f26d1dd0b25d5356d96
• https://github.com/benjifisher/matchit.zip/commit/904154141e618cd9fa7a86ed95fe8b26e5b21089
• https://github.com/benjifisher/matchit.zip/commit/4a13612adc5128f9b86b20397d712fdd9700b6a7

This PR imports them (and fixes a bug which was introduced by one of them).

[chrisbra]

Thanks Ken. I guess it's time to keep updating it again.