kestefanie/0.96-inmem-indexed-client — pull request #3 by myahmad (2014-07-08 17:08:43+00:00)
Title: Interface definition and major refactoring.

There are a LOT of changes, as you can see.
I guess you will just have to put your trust in me that it works! :-)
I have merged my changes carefully with your latest commits and made sure that it works smoothly.
You will need to accept my version of each file when it comes to handling all the merge conflicts.
Because manual merging will be extremely difficult; I suggest you avoid that path.