General cleanup of plot.py
Added pcolor and pcolormesh.