fix merge conflicts/linter errors

Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>

cmd/helm/serve.go

@@ -38,7 +38,7 @@ This command is intended to be used for educational and testing purposes only.
 It is best to rely on a dedicated web server or a cloud-hosted solution like
 Google Cloud Storage for production use.
 
-See https://github.com/kubernetes/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories
+See https://github.com/helm/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories
 for more information on hosting chart repositories in a production setting.
 `
 

pkg/tiller/hooks.go

@@ -53,6 +53,7 @@ var deletePolices = map[string]release.Hook_DeletePolicy{
 	hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION,
 }
 
+// Manifest represents a manifest file, which has a name and some content.
 type Manifest = manifest.Manifest
 
 type result struct {