Use mainline sippy_cup
Clean up the upgrade to sippy_cup 0.3