Different regex for user/tap/formula and user/tap.

Closes #23430.
Merge branch 'master' of http://github.com/mxcl/homebrew