no api-proxy visible with kubeadm and minor tweaks#170

chrisplo wants to merge 1 commit intocontiv:mastercontiv/contiv.github.io:masterfrom

chrisplo:k8s_updatechrisplo/contiv.github.io:k8s_updateCopy head branch name to clipboard