Fixed platforms & updated json-rpc.net - we should be just targeting AnyCPU now.
Added ConflictTests.
Merge pull request #143 from raistlinthewiz/develop

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