Made WeightedCalculation a mixin called Weighted, refactored Counter and Histogrammer accordingly.  Removed WeightedVectorCalculation.  Added __hash__ to Expression.