Revert the previous change - remove contour plots from api.  Not sure what's going on, contour.c seems to be building OK.