2011-03-26-london-demo

Taxonomy upgrade extras: