Issue841 durack1 matplotlib142 update

@doutriaux1 @aashish24 let's see if this passes the travis test and merge it as a 2.2 milestone