Better City and Player-Bonus Yield Computation

Compute[Yield]Value() functions now recognize player traits and can
process bonus yields from having a city (latter is primarily for minimum
settle fertility).