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...
Note zero based indexing in Tutorial.
Fixed ctypes issue in dcd and added tests.  re issue #184 and #183
Merge pull request #185 from kyleabeauchamp/mdtraj_dcd

Fixed ctypes issue in dcd and added tests.  re issue #184 and #183
check mismatch in shape during xtc load
typo in Trajectory.py
fix typo
Merge branch 'mismatch' of github.com:SimTk/msmbuilder into mismatch
Merge pull request #190 from SimTk/mismatch

check mismatch in shape during xtc load