Tenant and security groups are now configurable.

Have rebased my changes (and removed the `network_id` option, since that's already been done).