Updated COM port info for hamilton valves and Rainin pump
Adjusted COMports for fluidics on storm2
Handled merge conflict in kilroy settings
Additional tweak to fluidics COM ports