Combine ipv4.h and ipv6.h into address.h?

Suggested during a review. I'm not sure about this; I could go either way.