More fixes, though still not enough for the diplo bug

- updated default.map to refer to seasons.txt (from vanilla) for
consistency
- minor fixes
- removed now-invalid terminating entries in adjacencies.csv, as
in vanilla