add merge/mergehybrid and quick/quickhybrid and unit test for these new sorts