Changes to catmaid.  Need a bigger reorg.