merged Pump_HeatPort and Pump_Insulated into Pump.mo

This pull request merges our three pumps into one for #172 

Unit tests have been checked.