Fixed conflicts, ipip:true as defualt and added ipip_mode

docs/calico.md

docs/cloud.md

docs/comparisons.md

docs/coreos.md

docs/dns-stack.md

docs/downloads.md

docs/figures/kubespray-calico-rr.png

docs/getting-started.md

docs/ha-mode.md

docs/netcheck.md

docs/roadmap.md

docs/upgrades.md

docs/vars.md

docs/vault.md

extra_playbooks/upgrade-only-k8s.yml

inventory/group_vars/all.yml

inventory/group_vars/k8s-cluster.yml

library/kube.py

reset.yml

roles/bootstrap-os/defaults/main.yml