Add new command line options for clustering and role

@pauldix -- 'combined' sounded better to me, better than 'both'. If you want 'both', let me know.