Default site disabled by default and enabled for testing.  Fixing some conditionals for faster re-provisioning.