This adds a Tiller CLI flag to override the default, and tests to
make sure that the default comes up as expected.