Use update rather than find_and_modify
Merge pull request #1473 from danmcp/master

Switching some find and modify calls to updates