Merge branch 'master' into issue_1107-docker-versioning

Vagrantfile

cluster.yml

contrib/aws_iam/kubernetes-master-policy.json

contrib/aws_iam/kubernetes-master-role.json

contrib/aws_iam/kubernetes-minion-policy.json

contrib/aws_iam/kubernetes-minion-role.json

docs/atomic.md

docs/aws.md

docs/vars.md

inventory/group_vars/all.yml

roles/bootstrap-os/tasks/main.yml

roles/docker/tasks/main.yml

roles/docker/tasks/systemd.yml

roles/docker/templates/docker-dns.conf.j2

roles/docker/templates/docker-options.conf.j2

roles/docker/templates/docker_atomic.service.j2

roles/etcd/defaults/main.yml

roles/etcd/meta/main.yml

roles/etcd/tasks/check_certs.yml

roles/etcd/tasks/gen_certs_script.yml