Further code cleanup
Begin writing new army framework
First stable version of army rewrite
Moved some Sapient functions to WorldBrain; moved Merchant behavior into Goals system (now also part of WorldBrain
Wipe BasicMerchant brain out completely from code
Added Holy Sites to Pantheons; Pantheons now name themselves
Cleanup of brain/goal refactor; add holy sites to map; other minor tweaks
Quick fix for crash when best_commodity was None