Merge pod{Service,Client} configs

No real need to separate these. It's just confusing which config is intended for
what.