Testing in-memory fixes
Merge branch 'master' of github.com:afs/proto-lizard

Conflicts:
	.gitignore
	src/main/java/lizard/IndexServer.java
	src/test/java/lizard/index/TestMergeIterator.java