Combines upload-strategy-of-happiness doc with existing servers-of-happiness doc