Made the cluster builder script more general, removed fixed user