Clean up build refactor

Minimize master divergence.
Merge pull request #23 from ironcladlou/rebase_kube_upstream

Clean up build refactor