Revert "Added farms and locations associated with each farm to the test data"

This reverts commit 4114a2b47dcb8798f1df4e48fca19a7d8aeb1cb0.
Merging testdata changes
Merge branch 'Josh'
Revert "Revert "Added farms and locations associated with each farm to the test data""

This reverts commit 70a599f934a8c0c52374d8ae6b6365bb42131768.
Merge branch 'Josh'
testing autoid
trying to fix issues with django

Merge branch 'master' into Josh