Drupal update

Did a good day's work, between the soon-to-be-updated Christ Church Unity site and token module debugging. That'll be the last significant Drupal work until after Drupalcon, however, as I'll be heading off to sunny Arizona on Wednesday...