resolved conflicting changes

Author: asya999

.gitignore

@@ -1,7 +1,8 @@
 *.swp
 *.pyc
 *.config
+*.csv
+*.out
 *.log
 *.log.*
-*.out
-*.csv
+temp*

pytpcc/MONGODB_EXAMPLE

@@ -1,7 +1,13 @@
+# MongodbDriver Configuration File
+# generate example with default values via `tpcc.py --print-config mongodb`
 [mongodb]
-denormalize          = False
-uri                  = mongodb://listOfHosts:27017/test?ssl=true&replicaSet=RSName&authSource=admin&retryWrites=true
-user                 = username
-passwd               = passwd
+# The mongodb connection string or full URI or mongodb+srv string
+uri                  = mongodb://localhost:27017
+causal_consistency   = True
+findandmodify        = True
 name                 = tpcc
-findAndModify        = True
+secondary_reads      = True
+denormalize          = True
+retry_writes         = True
+# user                 = username
+# passwd               = passwd