use multi-val dims for metrics
fix search
cleanup according to cr
Merge pull request #773 from metamx/cleanup-metrics

Use multi-val dims for metrics