Added an admin link to the shotbot page. Fixes #28
Removed the calibration dispense text field from the dispenser
page. Changed the test dispense button to be configurable
from config.py, default 10ml. Also, use a shorter timeout for
is_dispensing commands, since those are more likely to get
interference from a running motor. Fixes #38. Fixes #22.
Which cancel button? Fixes #29
Removed suggested drink size and change "this drink is popular".
Fixes #31. Fixes #33.
Ensure that the drink strength shows up appropriately. Fixes #30
Default action on drinks page should be save. Fixes #43
Reload the dispenser page after hitting reset to ensure correct button states. Fixes #41
Fix a ticks vs ml mismatch. Fixes #47
Added a note about dispensing accuracy of our dispenser
All the internals now work off metric. Only the display for
standard (dumbass) units changes.
Minor wankings
Fix standard mode
Updated drink descriptions with kickstarter names
Merge branch 'master' of github.com:partyrobotics/bartendro
Committing a couple of software only mode issues
With fixes in place. Should unbreak the db.
Merge branch 'master' of git://github.com/partyrobotics/bartendro

Conflicts:
	ui/bartendro.db.default
	ui/bartendro/view/drink/drink.py
	ui/config.py.default
	ui/content/templates/drink/index