Added fix for pandas issue, backported from matrix branch.
Fix typo
Merge pull request #469 from kyleabeauchamp/pand

Added fix for pandas issue, backported from matrix branch.
Merge branch 'master' of https://github.com/rmcgibbo/mdtraj