Make updates atomic from the client side.
Merge pull request #737 from brendandburns/atomic

Make updates atomic from the client side.