updated drink.py to sync with novel_drink
Merge branch 'master' of https://github.com/sgreenstein/RobotBartender