In relation to this, I have made an attempt at a merge of the CactusBase repository. The result can be obtained from https://bitbucket.org/barrywardell/cactusbase.git. This only includes the master and a couple of release branches for now.