Normalize all rules into one set of ingress rules

Also add some looping / etc for more common errors I saw while creating
VPCs.