Pulled Server and ProtoSerializable up a package level
Added single machine version of Catcher service.
Fixed conflicts
Removed surefire experiment