Update diagnostics to be CMOR compliant ready for CMIP6, or add missing diagnostics.

CMIP6 ocean diagnostics document:
http://www.clivar.org/sites/default/files/documents/CMIP6_OMIP_physics_diagnostics_0.pdf