Move pour_bottle into class Bottle

This also works around a bug in (a specific version of) ino that caused
compilation to fail because it auto-generated prototypes in a wrong way.
Add sanity check: Cocktail must not be larger than MAX_DRINK_GRAMS
config.h: Comment the unit of TURN_*_DELAY (milliseconds)
Merge branch 'master' of github.com:rfjakob/evobot-arduino

Conflicts:
	src/sketch.ino