Cleaned up most-popular-drink-hashes so they are indexed by the name string rather than the item object.
Added functionality for listing happy-hour and non-happy-hour drinks.