Style oter_t.
Remove settlement.cpp as it is no longer used at all.
Move colour lookup to a map.
Completely replace the oter_id enum by new overmap_terrains.json.
Merge branch 'master' into buildings_json
Fix overmap terrain allow_road checks.
Style and comment overmap::make_hiway().
overmap: fix legacy save/load
load_overmap_terrain; pre-set is_river, is_road, and set "id_base" prior to _north, _sw, etc
oter_id: switch from std::string to struct { int _value; } with flexible translation methods
generate: optimize the frack out of it; temporary until over/under etc is jsonized
Clean overmap::generate_sub a little.
Clean editmap.cpp a little.
Clean overmap::save() a little.
cleanup
fix house symbol
std::vector oter_t.directional_peers stores int idx of _north _south _ns _etc for any applicable oter
Speedup / cleanup / emshrinken; place_forest
WHOOPS: oter_t( ter(...) ) created huge amount of temporary oter_t()s.
RFI on oter_id.t(); type()?
Merge branch 'master' into buildings_json

Conflicts:
	output.cpp
Fix monster spawns.
Adds recipe to create 'blade' items at the forge using scrap metal.
Adds pump action 40mm grenade launcher.