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