various changes
figs added
Merge branch 'master' of git://github.com/csesha/contour-tree