After much deliberation, today we've decided to go with Drupal as our preferred CMS solution. So, of course the first thing to do is move our own site to it. As an added bonus, this means we'll both become proficient at customising, and be able to offer additional services to clients.
Taxonomy upgrade extras: