Farmyard Cleanup and Changes

brickoderequested to merge
(removed):farmyard-dev into pregmod-master

Hopefully this will improve readability a fair bit.

Merge request reports