New figures
new references
Merge branch 'master' of git://github.com/csesha/contour-tree

Conflicts:
	paint-contour-tree.tex