Baby steps, trying multi-machine config
Rolled back multi-machine because it was clearly breaking everything
Merge simpler Apache