Fixes #472
Fixes #471

Marble will remove herself from the farm once you finish recruiting her and move into the camp. I should add buttons for her to come/go from the camp to the farm... later, once more bugs are fixt.