[WIP][DO NOT MERGE] rebase kubernetes

kubernetes bumped, building, and test-end-to-end.sh work.  Anyone want to take the unit tests?

- [x] godeps bumped
- [x] compiling
- [x] hack/test-end-to-end.sh runs succesfully
- [ ] unit tests
- [ ] integration tests
- [ ] hack/test-cmd.sh