BUGFIX: Calculate demand properly, and don't purge stockpiles every turn
Make names more consistent throughout