Fix a number of issues with swimming and diving. Also added 2 test rooms for the water controls
Minor fixes to swimming in order to prevent clipping