Adds a flow rate meter to pump UI

Also fixes a stupid merge error.