Also, don't forget to jump out the hot & cold at the hot water heater.
Can someone tell me why it has to be at the water heater? I've had contractors tell me the inspector wants the cold and hot water pipes and the gas line all bonded together "at the water heater".