Fixed platforms & updated json-rpc.net - we should be just targeting AnyCPU now.
Added ConflictTests.