Added test for upsert & update_one #336
Merge branch 'master' of github.com:MongoEngine/mongoengine