set up options and remove birth_ai_smart functionality
(cherry picked from commit 51f97e70880c8dcb67279251d774e588b937f7fe)

Conflicts:
	src/monster/melee2.c
initial implementation of birth_force_descend
(cherry picked from commit ba6d20970be21fa55c1204ab264c75875222d7a5)
Add debug command to really hurt monsters
(cherry picked from commit 524fb3408a1ef0427d1cca5ef0b48e57cab86b6d)
Bron's immunity changes.  Take maximum of physical vs. elemental damage
for meleee attacks
(cherry picked from commit e54973e4e2b06df138b0e63503a018c81e7742df)
(cherry picked from commit 47786b3c9f2f5bcbb4dece6992cbdc426d1e5878)
Make some attack types deal no physical damage, e.g. touch.
(cherry picked from commit b476c37e654d5e82bc66d0c928c40e3307d230dc)
(cherry picked from commit f4c80db3f500dadaa3817aea3f82765e8dcddc77)
Give the player a bonus to damage absorption for physical elemental
attacks.
(cherry picked from commit 58144e74d42248b664a84b27fe4d4a44b570e548)
(cherry picked from commit 968365daa1ff952b826751238ac460f3f7ea3c8c)
Change frequencies for vaults, pits, special rooms.
(cherry picked from commit c0cd5bfd31896d29621d9d567d0a99c2103b698b)
(cherry picked from commit afc4af04496d68c6ef2227aaeabf7400fbd77aac)
Change pit size, make nest size variable
(cherry picked from commit 25d6f93e11d5a4e77b817c7abafffd2ba622e3ab)
(cherry picked from commit a7ac7c86a45f80bbf333d209f50c1f0d37fed931)
Allow two pits/nests per level
(cherry picked from commit c0d3f85e3fbbc6068b95abe220b38cbb01b0bfa1)
(cherry picked from commit e57519238ed1893a749c18179e66073f8918aeaa)
Rewrite ego item allocation algorithm and values
(cherry picked from commit d155241d4818e2209cf0a559fb63346ad80aa7b7)

Conflicts:
	src/init2.c
fix slay-evil tracking in wiz-stats
(cherry picked from commit 8d9b9157e89987e4ed7cc36c88b39ae017b024eb)
Make good and great chances flatter
(cherry picked from commit 3d59a752da140e4099784a99ef914ce82ebe3baa)
change elvenkind speed values
(cherry picked from commit 4ea124205daa769c2ea1a4eb4460fbe1f43c82c8)
Give uniques a bonus to level creation
(cherry picked from commit 8c162623156391ea822771fe82b4297b3ae61133)

Conflicts:
	src/monster/mon-make.c
Add extra dice to items created by uniques and reduce the rolls for great
objects
(cherry picked from commit 1ef31b283a361f85d30ca9b004773f3bef3e78fe)

Conflicts:
	src/monster/mon-make.c
add new rooms laboratory, temple and arcanum
(cherry picked from commit 922cc3707a656a85ed63777ec58e49e3888fb3d3)
increase floor drops in caverns and labyrinths
(cherry picked from commit 84a8b7000f7f8c0d16ef07d3e18ada0d08017627)
set minimum level for template rooms to 5 (prevent OoD monsters appearing
on dlevel 1)
(cherry picked from commit bc5f06aa05285293b405078ca2e2177bff996c22)
reduce escort size
(cherry picked from commit 8554a1c034299266059bb5882a508d193580574a)

Conflicts:
	src/monster/mon-make.c
move GV min level to 35
(cherry picked from commit d48d79964fce9d1f2618fa6cc61acd0dd05bf5ab)