Various changes, seems to be a working version without a lot of validation so far
More changes so we can force calculation of the coherence factor using new parameters
Add handy typedef
Add missing initialisers, and a std::ostream output operator for const Variable&