Revert "Revert "Merge branch 'master' of https://github.com/colemickens/polykube.git""

This reverts commit 78e2465e8c18f14dc727de644ab219059b17d351.