Revert "Revert "Update help parsing""
Revert "Revert "Update help parsing""

This reverts commit 04e53ded75a691aad2e8edca67d5850ce5b3b7db.

tsg-ut/slackbot,tsg-ut/slackbot,tsg-ut/slackbot,tsg-ut/slackbot,tsg-ut/slackbot,tsg-ut/slackbot