small changes to fix warnings that come up in pandas .15

@jiffyclub You ok with these?  I will work on the failing test next ;)
Interesting. Well, whatever works.