Reign in drinks trigger and update tests

The triggers were too broad causing errors, specifically the "making" and "how to make" triggers were far too broad.

This greatly reduces the trigger space of the drinks IA and requires that "drink" be in the query when the trigger is "make" or "making"

//cc @russellholt @jagtalon @nilnilnil 
Why are these updates required to have it work?