@Modify
- adapted the upsert to the new conflict option http://rethinkdb.com/api/javascript/insert/
@Add
- added enum for conflict parameters
@Add
release note on upsert api change to conflict
unit tests for each conflict option
Merge pull request #177 from lucasjans/master

Support 1.14's conflict handling (replaces upserts)