Merged in changes from svn branch, and port to tri

The old code used matplotlib.delaunay, but that has been
deprecated.  This includes the first round of changes
necessary to use the newer matplotlib.tri API.
Minor fix for warning of div-by-zero, triplot