getting it done
Everything's finished and tested
Distro work
Merge branch 'distro-entry-form' into New-Farm-Location-Form
Merge branch 'New-Farm-Location-Form' of https://github.com/Cheekio/glean into New-Farm-Location-Form
Revert "Merge branch 'New-Farm-Location-Form' of https://github.com/Cheekio/glean into New-Farm-Location-Form"

This reverts commit 18b7fb5ee4fa6f6a5348d2e01588ffa7258b40f0, reversing
changes made to 4c1e3d5be9f5feab5fcd91b1851281c5266e3275.
small adjustments
pk out
login required adjustments
Merge branch 'master' into New-Farm-Location-Form

Conflicts:
	announce/tests.py
	announce/views.py
	farms/tests.py
conflict resolution
Merge pull request #38 from Cheekio/New-Farm-Location-Form

New farm location form