Updated this branch with mongokit
Conflicts resolved