@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)
Update PR #177's releases notes slightly
Upgrade to protocol V0_3, but still using the PROTOBUF protocol
Stash totally unpleasant work on using the JSON protocol

The state of JSON in .NET is a bit abysmal.  I don't want to add new
third-party dependencies like JSON.NET, the .NET's own JSON support
is highly coupled to using data contracts rather than free-form objects,
and I can't find a decent, simple parser that I can incorporate with
the correct licensing and an approach that doesn't build an object model
which I would have to translate into a Response object model.

On the plus side, I benchmarked a simple JsonWriter against the Protobuf
library for writing queries.  It showed a bit of a speed-up, but not
enough to salivate over.  I'm shelving this work until RethinkDB threatens
to kill the protobuf protocol. :-)
Stashing more work-in-progress on a simple JSON parser.
Import JSON library from sinesignal/ottoman @dragan for JSON protocol

This branch is now partially working with the JSON protocol; some tests
pass.  There's obviously a few mistakes in that all tests don't pass,
and there are a few FIXMEs for things that I've half-assed to get a start
on, and there's a lot of code added to Connection that probably doesn't
belong there.

It might be a good idea to separate out the protocol details from the
Connection class entirely, and make rethinkdb-net capable of using
either protocol.  Mostly that will make it clear what code is related
to the JSON protocol, but it would also be easy to support both in
the driver if there was a pressing need to.
Convert array/obj datums into MAKE_ARRAY and MAKE_OBJ terms
Restore normal logging to tests
Move protocol-specific code out of Connection into IProtocol impls

This keeps support for V0_2, V0_3 / Protobuf, and V0_3 / JSON.
Correct default protocol
Cleanup imports
Cleanup packet encoding for JsonProtocol
Update release notes