CLA-740 Refactor Server code to remove singletons
Upgrade to new ruby bson gem