Conflicts: app/coffee/DocOpsManager.coffee test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee test/acceptance/coffee/FlushingDocsTests.coffee test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee test/unit/coffee/RedisManager/prependDocOpsTests.coffee test/unit/coffee/RedisManager/pushDocOpTests.coffee