matshow fixes (and master branch update)

This has a few fixes to the PR for imshow/matshow. The diff is massive, because your master branch wasn't updated in a while, but only the last few commit are relevant.

Before we can merge this PR into the main master, we need to decide on the fate of plot_confusion. Shall we remove it for now and revisit it later?