Bring back default {merge: true}. Added merge function to models.

Left this up here so we can grep for "merge:" and the doc tool can pick it up but I didn't want to add the overhead of another function call to `set` so later it just copies the function over.