Fixed platforms & updated json-rpc.net - we should be just targeting Any...

...CPU now.

Added ConflictTests.