Working on last round of fixes
Merge branch 'deployment' of github.com:flyingoctopus/youngagrarians into origin-deployment