Merge geometric debugging code

There is still work to be done on geometric debugging, but this code has been tested live on the website for a week without complaints.  I've cleaned it up a bit for merging before Monday's hackathon.