2 small fixes to upgrade to pandas .15
this appears to fix all the warnings in pandas .15

It looks to like all of these fixes are reverse compatible and are just helping us use pandas more safely.
Merge pull request #6 from synthicity/new-upgrade-to-.15

2 small fixes to upgrade to pandas .15