Adds ClientMergeable

Will write the tests tomorrow.

closes #459 
how much of these println's are for debugging vs test content? should they be asserts?