Merge pull request #3 from bardiharborow/master

Partway through converting to use of jsonrpc
almost done changeing to jsonrpc; still untested
minor style changes
removing jsonrpctest