Fixed conflicts, ipip:true as defualt and added ipip_mode

.github/ISSUE_TEMPLATE.md

.gitlab-ci.yml

README.md

RELEASE.md

Vagrantfile

cluster.yml

contrib/aws_inventory/kubespray-aws-inventory.py

contrib/azurerm/README.md

contrib/inventory_builder/inventory.py

contrib/inventory_builder/setup.cfg

contrib/inventory_builder/tests/test_inventory.py

contrib/kvm-setup/README.md

contrib/kvm-setup/group_vars/all

contrib/kvm-setup/roles/kvm-setup/tasks/sysctl.yml

contrib/network-storage/glusterfs/README.md

contrib/terraform/aws/README.md

contrib/terraform/aws/create-infrastructure.tf

contrib/terraform/aws/docs/aws_kubespray.png

docs/ansible.md

docs/aws.md