Changed merge/merge_with to update/update_with to make naming more pythonic
In preparation for v0.6.3