Mongoid 3.x changes

Would appreciate it if we can incorporate some minor changes for Mongoid 3.x

Changes are not backwards compatible with Mongoid 2.x, but it's pretty straight forward otherwise.