Fix elections and NPC spawning
Merge branch 'master' of https://github.com/tylerstacey/fiech-land