Working out a few bugs
Merge branch 'master' of https://github.com/bensechrist/civ-simulator