Shifted some of the MCMC structure around a bit to facilitate combining
EdgeMove and TopologyMove objects into an McmcCombinationMove.
Still fiddling with how to get EdgeMove and TopologyMove to co-operate with each other.
Mostly done, but an error comes in DEBUG mode due to the new alignment
not being updated in StructAlign at some point. In non-debug, results
look ok, but the edge-topology moves are never accepted.
Deactivating edgeTopology moves for now.
Merge branch 'joint_edge_topology' into structalign