Merge branch 'master' into ja_redis_cluster

services/document-updater/app/coffee/TrackChangesManager.coffee

@@ -39,4 +39,3 @@ module.exports = TrackChangesManager =
 					if error?
 						logger.error err: error, doc_id: doc_id, project_id: project_id, "error flushing doc to track changes api"
 			callback()
-

services/document-updater/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/sharelatex/document-updater-sharelatex.git"
   },
   "dependencies": {
-    "async": "^2.0.0-rc.5",
+    "async": "2.0.0-rc.5",
     "coffee-script": "1.4.0",
     "express": "3.3.4",
     "ioredis": "^2.0.1",

services/document-updater/test/unit/coffee/TrackChangesManager/TrackChangesManagerTests.coffee

@@ -93,4 +93,3 @@ describe "TrackChangesManager", ->
 					)
 					.should.equal true
 
-