Improve VPC support

This change improves VPC support (mostly around subnets).
The group editing change is required for those of us who have networks complex enough to require circular dependencies and can't waste security groups working around it otherwise which is particularly an issue with VPCs and the extra limitations they incur around groups.

I did a little white space cleanup (mostly removing trailing white spaces) while I was here.