Update for MongoDB 2.6

Some tweaks and two new config options