New scheduler

As requested by @wschoenell, I merged the scheduler with the latest version of chimera.