fix build against latest k8s; still getting podInfo errors, though pods seem to launch ok
Merge branch 'demo' of github.com:mesosphere/kubernetes-mesos into demo