Add ability to retry on conflict during upsert, both bulk and regular
Merge pull request #119 from mnussbaum/master

Add ability to retry on conflict during upsert, both bulk and regular