bugfix in imitate-best-neighboring-plans

I'd removed the two-stage update, which meant that updates
of cropplans and months were sequential instead of parallel.
put back the two-stage update that Janssen had in the original
version.