Pulling in Thor changes to print friendly error on ambiguous command