Revert "	modified:   augustus/src/lock.js"

This reverts commit 9f63768bd11ab7670c8b3d96a3b67123812f0498.

	modified:   augustus/src/lock.js
	modified:   augustus/src/merger.js
	modified:   caligula/Makefile