Update to matplotlib 1.3.1 incl. img tolerance change

This PR replaces #951, adding the necessary changes to the image comparison tolerance. This change is necessary as the metric is not on a comparable scale to the previous comparison metric. The new value was determined through a bit of experimentation on different platforms.