Merge pull request #2 from boorad/master

ignore mvn target folder
Small change to wire protocol to allow mergeFrom to be used more often
Added untested ClusterState class
Integrated ClusterState into CatcherServerImpl
Added first server tests.  Cleaned up ClusterState.
Additional tests for ClusterState.  Still need more around session expiration.
Updates to reflect how ZK actually works.  The perils of mocking.
make class public
add 'test' to package to help with name resolution