Merge branch 'jl/submodule-rm'

Finishing touches to "git rm $submodule" that removes the working
tree of a submodule.

* jl/submodule-rm:
Teach rm to remove submodules when given with a trailing '/'

diff --cc builtin/rm.c
Simple merge