* includes changes from Capgemini#86
* Fix nested quotes for terraform 0.7.x
* Use template_file as data resource for terraform 0.7.x
* Convert etcd_discovery_url to null_resource

  In Terraform 0.7.x, template file data sources do not support the
  'provisioner' parameter. So instead, we must now use a null_resource to
  get the discovery URL.

  And, unfortunately, depending on a null_resource does not mean that you
  can read the file before it exists.

* separate out vpc_public_cidrs_list and move it next to dependent list of AZs
* aws_instance: fix subnet_id
* convert security_groups -> vpc_security_group_ids
* tag aws_vpc with org Name
* add empty etcd_discovery_url.txt

…s changes to public-cloud