CRA-621 Bug in TimeLine::advanceTime(). Split, evolve and merge should only be called at new vintage, not at new data type in same vintage.

Some cleanup in main.cpp