Updated OS frame and Salinity module.

Should both be networked now, though im not sure since im having trouble
getting it to compile.(the salinity module)