added hybrid metrics (Hybrid, and HybridPNorm) to msmbuilder.metrics.__init__
Merge pull request #180 from schwancr/metric_init

added hybrid metrics (Hybrid, and HybridPNorm) to msmbuilder.metrics.__i...