Cleanup and startup fixins

* Create a decent initial search tree to load
* Ensure waiting for messages is appropriate
* Update to Akka 2.2-M2 for clustering support.