Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/PureMap.hs
	haskell/lvish/Data/LVar/SLMap.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/LVishAndIVar.hs

It is still controlled by a dynamic flag, however.

Conflicts:
	haskell/lvish/Control/LVish/Sched.hs

Still seeing problematic failures on v9f for instance.

Conflicts:
	haskell/lvish/Control/LVish/Basics.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedQueue.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/SkipListTests.hs

Conflicts:
	haskell/DEVLOG.md
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedQueue.hs
	haskell/lvish/lvish.cabal

…ething up because 12/70 tests fail.

Conflicts:
	haskell/DEVLOG.md
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/ArrayTests.hs

Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/DeepFrz.hs
	haskell/lvish/Data/LVar/Generic/Internal.hs
	haskell/lvish/Data/LVar/IStructure.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/Internal/Pure.hs
	haskell/lvish/tests/ArrayTests.hs

Minor changes only.

This is a PAINFUL merge because git failed to track the moved files here.
A simple refactor on the upstream has made this more difficult.  This is in
addition to the file renames that happened on the nonidem branch in the first place.

After manually fixing things up, this rev builds and can run tests.  But there are significant timeout failures!!!

Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/Basics.hs
	haskell/lvish/Control/LVish/DeepFrz.hs
	haskell/lvish/Control/LVish/Internal.hs
	haskell/lvish/Control/LVish/Logical.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedIdempotent.hs
	haskell/lvish/Control/LVish/Unsafe.hs
	haskell/lvish/Data/LVar/Counter.hs
	haskell/lvish/Data/LVar/CycGraph.hs
	haskell/lvish/Data/LVar/Generic/Internal.hs
	haskell/lvish/Data/LVar/IStructure.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/Internal/Pure.hs
	haskell/lvish/Data/LVar/LayeredSatMap.hs
	haskell/lvish/Data/LVar/NatArray.hs
	haskell/lvish/Data/LVar/PNCounter.hs
	haskell/lvish/Data/LVar/Pair.hs
	haskell/lvish/Data/LVar/PureMap.hs
	haskell/lvish/Data/LVar/PureMap/Unsafe.hs
	haskell/lvish/Data/LVar/PureSet.hs
	haskell/lvish/Data/LVar/SLMap.hs
	haskell/lvish/Data/LVar/SLSet.hs
	haskell/lvish/Data/LVar/SatMap.hs
	haskell/lvish/Experimental/BitArray.hs
	haskell/lvish/Internal/Control/LVish/SchedIdempotent.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/ArrayTests.hs
	haskell/lvish/tests/LVishAndIVar.hs
	haskell/lvish/tests/SNZITests.hs
	haskell/lvish/tests/SkipListTests.hs

Conflicts:
	haskell/DEVLOG.md