add back openstack-nova
rename templates to remove unncessary etcd- prefix
Default to new discovery API for EC2 VMs to discover each other

https://coreos.com/docs/cluster-management/setup/etcd-cluster-discovery/
Using pre-built etcd v0.3.0
security group 'etcd' by default; fix path to executable