Changes to make GridScheduler and CLuster standalone. Not final!