added drink sizes (currently defaulting to medium)

I had to make the recipes have ingredient percentages instead of duration
pump cycle duration is now computed by the script in makedrink
fixed recipe model percentage instead of duration

missed this file in the commit
removed a test recipe

wasn't supposed to be in the commit
Merge remote-tracking branch 'origin/master' into drink_sizes
adjusted flow rate

adjusted flow rate to the estimated flow rate of the actual pump to be used
changed the name of a few drinks

we no longer need to specify the drink size in the name
drink sizes now available in the viewDrink page

options for drink sizes are now available in the viewdrink page
makedrink no longer defaults to a medium drink
fixed drink sizes buttons

buttons were not reflecting the correct sizes
removed swap file