Merge fixes, plus remove erroring file from RealismOverhaul.