Use private fork of matplotlib with fixes to plot_directive
Make use of new :context: reset