Changed .braney file merging to handle non-consequetive history ids and to combine runs with different numbers of iterations