Border Village and Farmland

Thanks for the help. That's taken care of the PBEM weirdness. It still seems that this pull-request is including 12 commits, not just the new 00e33 that contains my Border Village and Farmland code. I'll let you look at things from this state, though, and see what you think.