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 
The problem is that it was triggering on "how to make" and "making" which is a very wide query space. In the case of it triggering on those two triggers, I've added a check for "drink" to ensure the user's intent is about a drink.