fold metriqueu, metriquec back into metrique; tests still broken
version bump
fixup setup.py; add metrique cubes; fixup tests