change -skipClusterSetup to -clusterSetup and allow 'always'

Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>