Revert "Revert "cf help includes plugin commands""

This reverts commit 653a82d8a200540e8394c77087415b3706e78680.
Errant local test failures lead us to believe this commit
was broken. Investigation lead us to believe it's safe.