Removed dependencies on match from vega.
General cleanup.  Prepping for fixing the axis/name hack.