Border Village and Farmland

Here's the tests and code for Border Village and Farmland, using the shiny new buy/gain-watching framework. As discussed, there's a couple of interactions tests with Peddler that are currently failing.