Add '--upgrade' and '--wait' options to 'helm init'

'helm init --force-upgrade' does not work without the '--upgrade' option.
Without '--wait' option immediate 'helm list' after 'helm init --upgrade'
leads to errors with port forwarding.

helm_helpers.go

@@ -507,7 +507,7 @@ func deployTiller(namespace string, serviceAccount string, defaultServiceAccount
 	}
 	cmd := command{
 		Cmd:         "helm",
-		Args:        concat([]string{"init", "--force-upgrade"}, maxHistory, sa, tillerNameSpace, tls, storageBackend),
+		Args:        concat([]string{"init", "--upgrade", "--force-upgrade", "--wait"}, maxHistory, sa, tillerNameSpace, tls, storageBackend),
 		Description: "initializing helm on the current context and upgrading Tiller on namespace [ " + namespace + " ].",
 	}