Moving from Mongo to MongoClient

Fixes #352 - thanks!