Update matplotlib usage for compatibility with 3.3.0

This PR updates the matplotlib usage to be compatible with matplotlib-3.3.0.

EDIT: this PR now includes #1258, mainly so that all of the tests pass. Closes #1258.