ERDDAP OOI Release Support
Revert "Revert "Merge pull request #1012 from lukecampbell/qc""

This reverts commit f61b6f581bd5e6c67a3b6308a78316de96e48bc3.
Merge pull request #1015 from shenrie/master

Refactored resource prepare objects
Updates udunitspy ref
Fixes test_activateInstrumentSample
Merge pull request #1016 from lukecampbell/units

Updates udunitspy ref
Merge pull request #1017 from lukecampbell/qc

Fixes smoke with QC test
Merge pull request #990 from lukecampbell/pydap

ERDDAP OOI Release Support
Removes obsolete test
Merge pull request #1019 from lukecampbell/qc

Removes obsolete test
Bumped pyon