@Modify
- adapted the upsert to the new conflict option http://rethinkdb.com/api/javascript/insert/
@Add
- added enum for conflict parameters