Fixes for pandas 0.15
Merge pull request #262 from shoyer/pandas-0.15-fixes

Fixes for pandas 0.15