moved from inheritance to wrapping of mdtraj trajectory and topology
moved from inheritance to wrapping of mdtraj trajectory and topology
Merge branch 'mdtraj_wrap' into develop