Refs #804: Branch reintegrated into the trunk


git-svn-id: svn+ssh://svn.cern.ch/reps/cactus/trunk/cactuscore/swatch@31737 4525493e-7705-40b1-a816-d608a930855b
Refs #804: more outdated code removed


git-svn-id: svn+ssh://svn.cern.ch/reps/cactus/trunk/cactuscore/swatch@31738 4525493e-7705-40b1-a816-d608a930855b