WIP - adding an integration spec for known_uri relationships... really need it.
Merge conflict resolved (at least, the obvious one).
Gah. Removed my specs because they used measurement_values.  Sigh.