Fixed pandas 0.11 compat.
Merge pull request #468 from kyleabeauchamp/mymatrix

Fix for pandas 0.11