Modifications to Equipment schema and diagrams

1. I added the InstrumentOutputVariables entity back into the Equipment
schema. I need it for the Sensors extension.
2. I rearranged the Equipment diagram a little to show Variables and
Units connected to InstrumentOuputVariables.
3. I rearranged the LabAnalysis diagram a little for readability.