Adding options for enabling organizations and locations

I'd rather see these in the "run the installer" test block.