Moves the merge code from the Collection set method to a method on Model...

.... Adds Model merge tests.