2 small fixes to upgrade to pandas .15

@jiffyclub OK this has the 2 changes I really meant.

I do get a number of warnings that probably need to be looked at before merging this.