Rearrange json terrain entries to make map loading code happy.

It turns out map load relies on terrain types being defined in json in the same order.  I definitely need to fix that and rip out some of that legacy code, it's terrible.
Please test that this loads old saves properly.